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
91 Commits 87 Branches 50 Tags 181 MiB
ebc82f1a95
Commit Graph

91 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toby Zerner
ebc82f1a95 Merge pull request #37 from dcsjapan/plural-alert 
Pluralize the post liked notification string
 2015-10-24 14:24:07 +10:30
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
Toby Zerner
2672835b8d Merge pull request #36 from dcsjapan/add-others 
Add an "others" key for Likes notifications
 2015-10-24 12:43:20 +10:30
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
Toby Zerner
36798e97ad Merge pull request #31 from maelsoucaze/master 
Modify the label for the notification setting
 2015-10-23 19:19:39 +10:30
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
Toby Zerner
d3b5209f76 Merge pull request #30 from dcsjapan/mentions-key-reorganization 
Reorganize key names for Mentions
 2015-10-23 16:23:28 +10:30
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
Toby Zerner
4c6e4dc995 Merge pull request #27 from dcsjapan/tags-key-reorganization 
Reorganize key names for Tags
 2015-10-23 12:03:19 +10:30
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
Toby Zerner
356293ffc6 Merge pull request #25 from dcsjapan/subs-key-reorganization 
Reorganize key names for Subscriptions
 2015-10-22 16:53:34 +10:30
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
Toby Zerner
86b8875050 Merge pull request #23 from dcsjapan/reuse-sticky 
Clean up reused "sticky" string
 2015-10-22 11:31:42 +10:30
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
Toby Zerner
07ff5fcb21 Merge pull request #22 from dcsjapan/badge-key-rename 
Rename keys for badge tooltips
 2015-10-22 11:11:14 +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
Franz Liedke
cc7d553d95 Merge pull request #16 from maelsoucaze/typo 
Fix a typo
 2015-10-21 10:28:52 +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
Toby Zerner
d3a48bf323 Merge pull request #15 from dcsjapan/badge-namespace 
Add namespacing for badges
 2015-10-21 18:11:24 +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
Toby Zerner
b2cfbf4450 Merge pull request #13 from dcsjapan/extension-key-reorganization 
Reorganize key names for Flags
 2015-10-21 17:33:00 +10:30
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