Commit Graph

10 Commits

Author SHA1 Message Date
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
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
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
Toby Zerner
1f5269d874 Namespace extension translations
Also update with the new plural syntax
2015-10-16 12:35:05 +10: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