mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-21 00:31:17 +02:00
Code Issues Releases Wiki Activity

Reorganize key names

Browse Source 
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Extracts previously unextracted strings.
This commit is contained in:
dcsjapan
2015-10-22 09:21:00 +09:00
parent 45e3e0fbff
commit 160f092810
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sticky/js/admin/src/main.js
View File

@@ -6,7 +6,7 @@ app.initializers.add('flarum-sticky', () => {
extend(PermissionGrid.prototype, 'moderateItems', items => { extend(PermissionGrid.prototype, 'moderateItems', items => {
items.add('sticky', { items.add('sticky', {
icon: 'thumb-tack', icon: 'thumb-tack',
label: 'Sticky discussions', label: app.translator.trans('flarum-sticky.admin.permissions.sticky_discussions_label'),
permission: 'discussion.sticky' permission: 'discussion.sticky'
}, 95); }, 95);
}); });

2
extensions/sticky/js/forum/src/addStickyBadge.js
View File

@@ -7,7 +7,7 @@ export default function addStickyBadge() {
if (this.isSticky()) { if (this.isSticky()) {
badges.add('sticky', Badge.component({ badges.add('sticky', Badge.component({
type: 'sticky', type: 'sticky',
label: app.translator.trans('flarum-sticky.forum.stickied'), label: app.translator.trans('flarum-sticky.forum.badge.sticky_tooltip'),
icon: 'thumb-tack' icon: 'thumb-tack'
}), 10); }), 10);
} }

2
extensions/sticky/js/forum/src/addStickyControl.js
View File

@@ -7,7 +7,7 @@ export default function addStickyControl() {
extend(DiscussionControls, 'moderationControls', function(items, discussion) { extend(DiscussionControls, 'moderationControls', function(items, discussion) {
if (discussion.canSticky()) { if (discussion.canSticky()) {
items.add('sticky', Button.component({ items.add('sticky', Button.component({
children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.unsticky' : 'flarum-sticky.forum.sticky'), children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button'),
icon: 'thumb-tack', icon: 'thumb-tack',
onclick: this.stickyAction.bind(discussion) onclick: this.stickyAction.bind(discussion)
})); }));

2
extensions/sticky/js/forum/src/components/DiscussionStickiedNotification.js
View File

@@ -12,6 +12,6 @@ export default class DiscussionStickiedNotification extends Notification {
} }
content() { content() {
return app.translator.trans('flarum-sticky.forum.discussion_stickied_notification', {user: this.props.notification.sender()}); return '{username} stickied';
} }
} }

4
extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js
View File

@@ -7,7 +7,7 @@ export default class DiscussionStickiedPost extends EventPost {
descriptionKey() { descriptionKey() {
return this.props.post.content().sticky return this.props.post.content().sticky
? 'flarum-sticky.forum.discussion_stickied_post' ? 'flarum-sticky.forum.post_stream.discussion_stickied_text'
: 'flarum-sticky.forum.discussion_unstickied_post'; : 'flarum-sticky.forum.post_stream.discussion_unstickied_text';
} }
} }