github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-26 02:10:09 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity
190 Commits 87 Branches 50 Tags 181 MiB
a4a3185233
Commit Graph

154 Commits

Author SHA1 Message Date
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
Toby Zerner
682cc0ac12 Merge pull request #43 from maelsoucaze/require 
Add Flarum's Core as a requirement
 2015-11-25 14:56:42 +10:30
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
Franz Liedke
d81100b21c Fix broken link 2015-11-06 10:25:25 +01:00
Maël Soucaze
aee5189abf Add Flarum's Core as a requirement 2015-11-06 04:06:30 +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
dcsjapan
99b3bd6673 Reorganize key names for Pusher 
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-21 17:39:27 +09:00
Toby Zerner
44e128c617 Merge pull request #17 from maelsoucaze/newline 
Remove extra newline
 2015-10-21 19:07:17 +10:30
Maël Soucaze
594f23f808 Remove extra newline 2015-10-21 10:30:34 +02:00
Maël Soucaze
8a273c28eb Fix a typo 2015-10-21 10:27:14 +02:00
Toby Zerner
668eccb7b8 Merge pull request #14 from dcsjapan/lock-key-reorganization 
Reorganize key names for Lock
 2015-10-21 18:11:31 +10:30
dcsjapan
017bb43d69 Add namespacing for badges 
- Adds a `lib.badge` namespace to match extension handling.
 2015-10-21 16:30:20 +09:00
dcsjapan
e2c9683827 Reorganize key names for Lock 
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-21 16:19:28 +09:00
dcsjapan
c1a670a0ee Reorganize key names for Flags 
See flarum/core #265
- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
 2015-10-21 15:15:32 +09:00
Toby Zerner
429161c4fe Add translations for basic HTML interface 2015-10-21 11:37:46 +10:30
Toby Zerner
350248b6e9 Fix reference key name 2015-10-21 10:26:42 +10:30
dcsjapan
664faa296c Additional changes to library keys 
- Accommodates new error messages
- Changes the namespace for number abbreviations
 2015-10-20 12:28:34 +09:00
dcsjapan
be172f5092 Group translation keys by sub-key instead of prefix 
- Adds new sub-keys to replace key prefixes, and adjusts key names accordingly.
- Moves several button strings from `admin.permissions_` to `admin.permissions_controls`
- Merges `forum.settings_notify_` strings into `forum.settings`
- Rolls `forum.user_avatar_` strings into `forum.user`
- Moves the `user_deleted_text` to the `lib` namespace.
- Adds four other leftover strings to the `lib` namespace.
- Includes minor changes to formatting and comments.
 2015-10-19 18:24:38 +09:00
Toby Zerner
a6ba05862f Merge pull request #11 from maelsoucaze/readme 
Update translating instructions
 2015-10-19 19:16:52 +10:30
Maël Soucaze
8dda2018f4 Update translating instructions 2015-10-19 10:43:14 +02:00
Toby Zerner
38ad35a47b Merge pull request #10 from maelsoucaze/comments 
Comment the code (and add SVG LF support)
 2015-10-19 19:08:04 +10:30
Toby Zerner
f78110370f Merge pull request #9 from maelsoucaze/valid-svg-1-1 
Valid SVG 1.1 Markup
 2015-10-19 19:03:13 +10:30
Maël Soucaze
f27d328c84 Comment the code 2015-10-19 10:30:16 +02:00
Maël Soucaze
1eaa2c5130 Valid SVG 1.1 Markup. 2015-10-19 10:20:05 +02:00
Maël Soucaze
d3c1097f86 Use right email subjects. 2015-10-19 10:11:40 +02:00
Toby Zerner
029c306bd0 Add email translations; namespace reused strings 2015-10-19 11:24:08 +10:30
Toby Zerner
1f5269d874 Namespace extension translations 
Also update with the new plural syntax
 2015-10-16 12:35:05 +10:30
Toby Zerner
e6ee0ebefa Add validation translations 
These are the translations for Laravel's Validation component. They are in their own top-level namespace. Unlike the rest of Flarum's translations, the variables are marked by a :colon prefix rather than {curlies}.
 2015-10-15 22:38:17 +10:30
Toby Zerner
eff26abc6a Switch to new plural format 
Flarum is now powered by Symfony's Translation component, which has a more powerful pluralization system. The rules for all locales are included in core so they no longer need to be included per-language pack. See http://symfony.com/doc/current/components/translation/usage.html#pluralization to learn about the format.

closes #550
 2015-10-15 22:37:00 +10:30
Toby Zerner
74f7c2a1db Fix typo in sign_up_log_in_text 2015-10-14 16:05:42 +10:30
Toby Zerner
14b97b8c15 Update icon, metadata 2015-10-12 15:00:25 +10:30
Toby Zerner
8458b59e78 Add translations for lib.series 2015-10-08 22:50:28 +10:30
Toby Zerner
6192901bc5 Simplify gitignore 
No need to try and cover everything, people can add global gitignore rules if their OS is generating weird files.
 2015-10-08 22:50:13 +10:30
Toby Zerner
4be8270c1a Update APIs 2015-10-07 23:07:44 +10:30
Toby Zerner
c98444382d Update icon API 2015-10-07 23:01:00 +10:30
dcsjapan
89ab96ae15 Update core YML with extracted strings 
See flarum/core#265
- Fixes namespacing of reorganized core keys (flarum/core#563)
- Includes strings for the admin interface (flarum/core#575)
- Includes a couple of leftover core strings (flarum/core#577)
 2015-10-06 12:14:05 +09:00
Toby Zerner
766bdb3cbb Remove unnecessary information from composer.json 2015-10-03 17:37:04 +09:30
Toby Zerner
520d52a048 Update for composer branch, add svg icon 2015-10-03 16:25:17 +09:30
Toby Zerner
d2cb4c2d77 Add some bundled extension translations 
But the key names are still yet to be redone.
 2015-10-03 16:24:08 +09:30
Toby Zerner
e81c94961e Remove "go to email provider" translations 
ref flarum/core#541
 2015-09-29 15:20:02 +09:30
Toby Zerner
5136eaf497 Merge pull request #6 from maelsoucaze/standardization 
Standardization
 2015-09-26 08:50:53 +09:30
Toby Zerner
a642181230 Merge pull request #5 from maelsoucaze/gitkeep-removal 
Remove the unecessary .gitkeep
 2015-09-26 08:50:27 +09:30
Toby Zerner
18713e8dba Merge pull request #4 from maelsoucaze/fontawesome-icon 
Change the Font Awesome icon
 2015-09-26 08:50:12 +09:30
Maël Soucaze
7048909284 Ignore junks files to be added 
It includes common OS junk files, some common backup and log files and
ensure that .git is ignored.
 2015-09-25 17:43:47 +02:00
Maël Soucaze
cd02134e09 Normalize line endings and export-ignore 
Ensure to normalize line endings to Unix (LF) and exclude some extra
files which are uncessary to the extension itself when exporting an
archive.
 2015-09-25 17:42:09 +02:00
Maël Soucaze
17375aafa1 Add .editorconfig for consistent coding styles 2015-09-25 17:39:33 +02:00
Maël Soucaze
c7b3dd9d6b Remove the unecessary .gitkeep 
The ".gitkeep" file is unecessary because the "locale/" subdirectory is
now correctly tracked by Git due to its content.
 2015-09-25 17:33:07 +02:00