github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 17:57:04 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity
270 Commits 87 Branches 50 Tags 181 MiB
dcef34bafa
Commit Graph

174 Commits

Author SHA1 Message Date
dcsjapan
c67c7bf638 Add translations for API error messages 
- Adds `:attribute` values for use in `validation.between.numeric`.
- Partially solves flarum/core/#973.
- Code needs to be revised to use these phrases.
 2016-06-04 16:07:07 +09:00
Toby Zerner
a4a3185233 Add new translations for flarum-ext-approval 2016-05-27 14:42:31 +09:30
Maël Soucaze
bf31979a59 Remove unnecessary double quotes (#77) 2016-05-23 22:59:16 +09:00
Maël Soucaze
dfd614e6ea Add language line for image dimensions validation rule (#78) 
See: da64a014e7
 2016-05-23 22:59:04 +09:00
Toby Zerner
93c4cd8960 Merge pull request #76 from dcsjapan/misc-cleanup 
Clean up translation keys
 2016-05-21 22:05:51 +09:30
Toby Zerner
cf9e032693 Add translation for "view post IP addresses" permission 2016-05-21 22:03:31 +09:30
dcsjapan
58daef61c3 Clean up translation keys 
- Removes two obsolete keys from the Extensions page.
- Corrects the suffix on a key in the Change Email modal.
- Extracts the title of the Edit User modal.
- Reorders keys in `core.email` namespace.
- Supports flarum/core#964
 2016-05-21 21:32:54 +09:00
Toby Zerner
ae7b67223a Merge pull request #74 from sijad/quote-select 
Add Quote button translation for mentions
 2016-05-21 20:40:59 +09:30
Toby Zerner
93de8f4a7d Change dismiss flag from tooltip into button 2016-05-21 20:28:38 +09:30
Toby Zerner
2c57f74608 Add translation for post "Edited" indicator 2016-05-21 20:28:29 +09:30
Sjjad Hashemian
e4775c6a91 Add Quote button translation for mentions 2016-05-18 11:05:35 +04:30
Maël Soucaze
69a3acdb6d Use existing reused translation keys. (#73) 2016-05-15 18:49:40 +09:00
David Sevilla Martín
9f7c68ffe1 Admin SMTP UI Translations (#72) 
* Added SMTP page & nav translations (includes SMTP on texts)
Changed from mail.* to smtp.* (thanks @dcsjapan)
Added _label to labels (thanks again)

* Making translations with better quality
(comment from @b9a10a1)

* Changed SMTP to Email, some minor changes, organization, some headings, refs...

* Updated ...SMTP page... comment to ...email page...

* updated translation keys to alphabetically, \& added quotes around email_text (thanks @maelsoucaze)

* Wow, so many extra spaces... I don't know when I added them :(

* Changed "adresses" to "addresses"
 2016-05-15 12:01:46 +09:00
Franz Liedke
0a1dc4c52e Translation for avatar upload tooltip 
Refs flarum/core#249.
 2016-04-17 22:34:53 +09:00
dcsjapan
18d57e282c Add translatable string for Flags 
- Adds translation for Flags notification.
- Supports flarum/flarum-ext-flags#6.
 2016-04-15 21:15:48 +09:00
dcsjapan
8a3ea800dd Fix unextracted translations in core blade files. 
- Adds language resources extracted from `reset.blade.php`.
- Moves `basic` key namespace to `views`.
- Subdivides `views` namespace based on filename.
- Supports #918.
 2016-04-07 17:49:55 +09:00
Franz Liedke
bf536f32a0 Update key and quotes 
As suggested by @dcsjapan.

Refs flarum/core#428.
 2016-04-01 10:48:19 +09:00
Franz Liedke
815133473b Adapt latest changes to DiscussionRenamedPost 
Refs flarum/core#428.
 2016-04-01 10:09:15 +09:00
Franz Liedke
afac1f6d19 Update locale keys and contents 
Refs flarum/core#428.
 2016-03-30 21:49:53 +09:00
Franz Liedke
54357f916d Split up info text for renaming discussions 
Refs flarum/core#428.
 2016-03-30 20:43:34 +09:00
Maël Soucaze
9d9e032955 Remove unnecessary double quotes 2016-03-28 07:59:37 +02:00
Toby Zerner
7af9bd7c30 Improve wording 
Thanks @maelsoucaze :)
 2016-03-28 16:06:29 +10:30
Toby Zerner
a7cdad8574 Add specific error message for forgot password modal 2016-03-28 15:47:14 +10:30
Toby Zerner
1cb6ebb51f Changes to user email confirmation translations 
- Remove unused messages in log_in + sign_up
- Reuse core.ref.confirmation_email_sent
 2016-03-23 22:15:19 +10:30
Sajjad Hasehmian
288b4b5f9a Add resend confirmation email strings 2016-03-23 01:06:31 +04:30
Franz Liedke
3965b3e3d0 Added cluster for ext-pusher 
Missing translation from flarum/flarum-ext-pusher#6.

Thanks, @Luceos.
 2016-03-14 20:05:57 +09:00
Maël Soucaze
49ab64960f Add some new Laravel's validation rules. 
Refers to:
- ef6b5a6343
- fa6c48d27c
- c36799ddde
- 789c75c24a
 2016-03-13 02:28:48 +01:00
Toby Zerner
f567f7dd5b Update translations for sudo mode removal (flarum/core#674) 2016-03-11 12:45:29 +10:30
Toby Zerner
d8cbe8a440 Update subscriptions setting translation; remove unused translation 2016-03-07 23:05:59 +10:30
Toby Zerner
bac0b84b88 Add validation message for username regex rule 
See flarum/core@445517ee84
 2016-02-26 14:00:03 +10:30
Maël Soucaze
ba34deb998 Sort alphabetically the "user" key 2016-02-04 18:49:12 +01:00
Sajjad Hasehmian
6127ebb8d7 Add Profile mentions tab translations 2016-02-04 01:00:58 +03:30
dcsjapan
ec5802a4d8 Add translations for the Add Extension modal 
- Adds three translations for this placeholder dialog.
- Updates the instructions to mention Composer.
- Supports
 2016-01-19 10:19:50 +09:00
Maël Soucaze
88aa866fe7 Sort alphabetically mark_all_as_read_confirmation 2016-01-13 00:28:08 +01:00
Bogdan Teodoru
ee85e9bbaf #679 Ask for confirmation before "Mark all as Read" 2016-01-11 23:11:59 +02:00
Bogdan Teodoru
ace61786ba Added "Are you sure you want to mark all notifications as read?" 2016-01-10 12:16:14 +02:00
Bogdan Teodoru
33b06f376e Added "Are you sure you want to mark all notifications as read?" 2016-01-09 15:21:45 +02:00
Maël Soucaze
162d82e2df Sort language keys by firstname (alphabetically) 2015-12-27 20:16:18 +01:00
Franz Liedke
fa72097a52 Merge pull request #57 from petermein/follow-after-reply 
Added forum heading and followAfterReply
 2015-12-27 15:51:36 +01:00
Peter Mein
3ced3d377f Moved english to package yml 2015-12-26 22:09:27 +01:00
Toby Zerner
e8e3a45ed2 Fix translation variable 2015-12-21 08:55:44 +10:30
Peter Mein
46f3f95842 Added forum heading and followAfterReply 2015-12-17 10:51:44 +01:00
Toby Zerner
8a698d14a6 Add ConfirmPasswordModal translations 2015-12-03 21:08:09 +10:30
dcsjapan
784ac722b7 Clean up locale files 
- Adjusts namespacing in support of flarum/core#648.
- Corrects key alphabetization in a few locale files.
 2015-11-30 11:23:18 +09:00
Toby Zerner
c7c83ef771 Merge pull request #45 from dbohn/master 
Added language key for allowing edit of tags.
 2015-11-30 09:13:02 +10:30
dcsjapan
ebb08d8596 Fix translations 
- Fixes a copypasta translation in Suspend.
- Thanks to @maelsoucaze for proofreading, as always!
 2015-11-29 16:51:29 +09:00
dcsjapan
5099791b55 Add translations for Akismet 
- Adds resources to support flarum/akismet#1.
 2015-11-29 15:02:59 +09:00
Toby Zerner
8831566a09 Merge pull request #52 from dcsjapan/extract-approval 
Add translations for Approval and Suspend
 2015-11-29 15:17:20 +10:30
dcsjapan
fd13c4609e Add translations for Flarum Auth extensions 
- Adds resources to support flarum/auth-facebook#1.
- Adds resources to support flarum/auth-github#1.
- Adds resources to support flarum/auth-twitter#1.
 2015-11-29 13:14:40 +09:00
dcsjapan
a626f6dbb5 Add translations for Approval and Suspend 
- Adds resources to support flarum/approval#1.
- Adds resources to support flarum/suspend#2.
- Updates a comment in core language resources.
 2015-11-29 12:15:44 +09:00
dcsjapan
a4a538aa8a Adds a missing translation text. 2015-11-28 17:44:52 +09:00
dcsjapan
3df88d6e33 Adds required double quotes to a translation. 2015-11-28 17:38:21 +09:00
dcsjapan
29dc0d5021 Extract leftover strings 
- Adds resources in support of flarum/core #645.
- Also fixes a few comments in the core and Tags resources.
 2015-11-28 17:19:53 +09:00
dcsjapan
42eb6e3c43 English revamp for i18n docs 
- Moves `ref` below `email`, adjacent to `group`.
- Deletes block comment for `email` namespace.
- Adds detail to block comment for `group`.
- Changes "string" to "translation" in all files.
 2015-11-28 13:48:02 +09:00
Franz Liedke
2a7ccf81d5 Merge pull request #47 from maelsoucaze/laravel-validation 
Add "required_unless" lang line
 2015-11-25 14:09:44 +01:00
Maël Soucaze
a2d6f82ad4 Add "required_unless" lang line 2015-11-25 13:34:33 +01:00
Franz Liedke
2e821a7d1b Merge pull request #46 from maelsoucaze/empty-text 
Do not ask to create a new discussion anymore
 2015-11-25 13:25:22 +01:00
Maël Soucaze
41b1334e20 Do not ask to create a new discussion anymore 2015-11-25 12:30:00 +01:00
David Bohn
dda09653ab Update translation according to suggestions 2015-11-21 14:17:03 +01:00
Toby Zerner
f79844d1e3 Add translation for discussion composer title 
Extracts "Start a Discussion" into a reference variable
 2015-11-21 13:17:47 +10:30
Toby Zerner
342ad776da Add new core translation 2015-11-20 12:37:29 +10:30
David Bohn
77d7c19386 Added language key for allowing edit of tags. Part of fix for flarum/core#330 2015-11-19 22:37:12 +01:00
dcsjapan
7319073f10 Add comment to core.ref.okay 
- Adds a comment to indicate use by Tags extension
 2015-11-05 07:49:39 +09:00
Toby Zerner
e2763c3b5a Remove unnecessary quotes 2015-11-04 18:34:12 +10:30
Toby Zerner
689ec697ed Add new translations for flag settings and reason descriptions 2015-11-04 13:00:11 +10:30
Toby Zerner
78283565a6 Remove unnecessary quotes 2015-11-04 09:07:58 +10:30
Toby Zerner
931c80dad0 Add translation for loading indicator 2015-11-03 18:13:43 +10:30
Toby Zerner
850ba9fdc0 Add translation for "Follow" button tooltip 2015-11-03 17:18:18 +10:30
Toby Zerner
8b819c21ca Change flag post modal "Reason" heading 2015-11-03 16:01:43 +10:30
Maël Soucaze
5ff4c1fd64 Quote values with special or reserved characters 
Quotes are required when the string contains special or reserved
characters (`:`, `{`, `}`, `[`, `]`, `,`, `&`, `*`, `#`, `?`, `|`, `-`,
`<`, `>`, `=`, `!`, `%`, `@`, and `\`).

See:
http://symfony.com/doc/current/components/yaml/yaml_format.html#strings
 2015-10-28 14:26:56 +01:00
dcsjapan
edc98bfe71 Pluralize the post liked notification string 
- Adds a comment to indicate a pluralizable string.
- Supports https://github.com/flarum/likes/commit/e867b54.
 2015-10-24 12:36:30 +09:00
dcsjapan
b3dbe065c4 Add an "others" key for Likes notifications 
- Adds a key I overlooked in the reorganization.
 2015-10-24 11:11:44 +09:00
Toby Zerner
50b9245bff Merge branch 'pluralize-others' of https://github.com/dcsjapan/flarum-english 
# Conflicts:
#	locale/flarum-mentions.yml
 2015-10-24 11:56:04 +10:30
Toby Zerner
de61e492cb Merge pull request #35 from dcsjapan/pluralize-alert 
Pluralize the post mentioned notification string
 2015-10-24 11:53:49 +10:30
dcsjapan
07c849e780 Merge reused strings into core 
- Merges two strings from Likes and Mentions into the core YML.
- Adds commenting to core YML to indicate strings referenced by extensions.
- Changes `others_link` to `others_text` in Mentions.
- Removes obsolete `ref:` namespace from Mentions.
 2015-10-24 10:14:20 +09:00
Toby Zerner
66f0bf2755 Merge pull request #32 from maelsoucaze/reply 
Merge Reply references into a reused string
 2015-10-23 20:33:45 +10:30
Toby Zerner
502811a590 Merge pull request #33 from dcsjapan/confirm-okay 
Use "OK" for submit button in Choose Tags modal
 2015-10-23 20:33:23 +10:30
dcsjapan
5b70099030 Use "OK" for submit button in Choose Tags modal 2015-10-23 18:48:40 +09:00
Maël Soucaze
9c0a4447a7 Merge Reply references into a reused string 
Two strings use *Reply*, it's not necessary to translate it twice. The
newly `core.ref.reply` reused string fix that.
 2015-10-23 11:37:49 +02:00
Maël Soucaze
e6288800e1 Fix a missing word 2015-10-23 08:56:56 +02:00
Maël Soucaze
466e526161 Modify the label for the notification setting 2015-10-23 08:54:07 +02:00
dcsjapan
0016b73725 Pluralize the post mentioned notification string 
- Adds a comment to indicate a pluralizable string.
- Supports https://github.com/flarum/mentions/pull/13.
 2015-10-23 15:51:32 +09:00
Franz Liedke
ae4e0728db Merge pull request #28 from dcsjapan/likes-key-reorganization 
Reorganize key names for Likes
 2015-10-23 08:19:48 +02:00
dcsjapan
9b70bee805 Modify the label for the notification preference setting 2015-10-23 15:18:23 +09:00
dcsjapan
06fcb39fb4 Reorganize key names for Mentions 
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
- Adds comments to indicate pluralizable strings.
- Supports https://github.com/flarum/mentions/pull/12.
 2015-10-23 14:49:15 +09:00
dcsjapan
1d83d4dc0d Reorganize key names for Likes 
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
- Adds a comment to indicate a pluralizable string.
- Supports https://github.com/flarum/likes/pull/3.
 2015-10-23 11:31:53 +09:00
dcsjapan
80de9f95c5 Reorganize key names for Tags 
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
- Supports https://github.com/flarum/tags/pull/22.
- (Also adjusts one string in **flarum-subscriptions.yml**.)
 2015-10-23 10:11:34 +09:00
Toby Zerner
9a3da76444 Merge pull request #26 from dcsjapan/fix-comments 
Revise "reused strings" commenting to match core
 2015-10-22 17:02:27 +10:30
Toby Zerner
5861c95d08 Add rate limit (flood control) error message 2015-10-22 16:56:59 +10:30
dcsjapan
d0a0fe7e06 Revise "reused strings" commenting to match core 
- Fixes commenting on two files where I accidentally used an old version.
 2015-10-22 15:26:58 +09:00
dcsjapan
bb4ea25842 Reorganize key names for Subscriptions 
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
 2015-10-22 15:19:50 +09:00
dcsjapan
02d0b35173 Clean up reused "sticky" string 
- Adds a reused string and two references
 2015-10-22 10:00:21 +09:00
Toby Zerner
1ae2f49c05 Merge pull request #21 from dcsjapan/sticky-key-reorganization 
Reorganize key names for Sticky
 2015-10-22 11:11:22 +10:30
dcsjapan
fa7aa742d4 Rename keys for badge tooltips 
- Shortens two key names for consistency with `badge:` namespace.
- Supports https://github.com/flarum/core/pull/601
- Supports https://github.com/flarum/lock/pull/4
 2015-10-22 09:39:25 +09:00
dcsjapan
7c61dd4790 Reorganize key names for Sticky 
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
 2015-10-22 09:20:24 +09:00
Franz Liedke
89ffa4962b Merge pull request #18 from dcsjapan/pusher-key-reorganization 
Reorganize key names for Pusher
 2015-10-21 13:06:56 +02:00
Franz Liedke
f24a06ef36 Merge pull request #19 from dcsjapan/lock-key-fix 
Fix key names in Lock
 2015-10-21 13:06:13 +02:00
Franz Liedke
a8c6c90895 Merge pull request #20 from dcsjapan/flags-key-fix 
Fix key names in Flags
 2015-10-21 12:44:40 +02:00
dcsjapan
0f144be8cb Fix key names in Flags 
- Fixes a few key name errors in PR #13
 2015-10-21 19:33:10 +09:00
dcsjapan
a1cdde209b Fix key names in Lock 
- Fixes several key name errors in PR #17.
- Adds missing comment for `post_stream`.
 2015-10-21 19:06:49 +09:00