github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-19 08:32:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

i18n: Use new translation strings

Browse Source 
closes flarum/core#527
This commit is contained in:
Toby Zerner
2015-10-24 12:27:53 +10:30
parent 1a36ef50d5
commit 2b49987ff3
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
extensions/tags/js/forum/src/components/DiscussionTaggedPost.js
View File

@ -3,24 +3,11 @@ import punctuateSeries from 'flarum/helpers/punctuateSeries';
import tagsLabel from 'flarum/tags/helpers/tagsLabel'; import tagsLabel from 'flarum/tags/helpers/tagsLabel';
export default class DiscussionTaggedPost extends EventPost { export default class DiscussionTaggedPost extends EventPost {
icon() { static initProps(props) {
return 'tag'; super.initProps(props);
}
// NEED TO FIX: const oldTags = props.post.content()[0];
// This should return one of three strings, depending on whether tags are added, removed, or both: const newTags = props.post.content()[1];
// if added: app.translator.trans('flarum-tags.forum.post_stream.added_tags_text')
// if removed: app.translator.trans('flarum-tags.forum.post_stream.removed_tags_text')
// if both: app.translator.trans('flarum-tags.forum.post_stream.added_and_removed_tags_text')
// The 'flarum-tags.forum.discussion_tagged_post' key has been removed from the YAML.
descriptionKey() {
return 'flarum-tags.forum.discussion_tagged_post';
}
descriptionData() {
const post = this.props.post;
const oldTags = post.content()[0];
const newTags = post.content()[1];
function diffTags(tags1, tags2) { function diffTags(tags1, tags2) {
return tags1 return tags1
@ -28,30 +15,43 @@ export default class DiscussionTaggedPost extends EventPost {
.map(id => app.store.getById('tags', id)); .map(id => app.store.getById('tags', id));
} }
const added = diffTags(newTags, oldTags); props.tagsAdded = diffTags(newTags, oldTags);
const removed = diffTags(oldTags, newTags); props.tagsRemoved = diffTags(oldTags, newTags);
const actions = [];
// PLEASE CHECK:
// Both {addedTags} and {removedTags} in the above three strings can be returned using the same key.
// The key names has been changed ... Is it possible to combine these two operations?
if (added.length) {
actions.push(app.translator.transChoice('flarum-tags.forum.post_stream.tags_text', added, {
tags: tagsLabel(added, {link: true}),
count: added
}));
} }
if (removed.length) { icon() {
actions.push(app.translator.transChoice('flarum-tags.forum.post_stream.tags_text', removed, { return 'tag';
tags: tagsLabel(removed, {link: true}),
count: removed
}));
} }
return { descriptionKey() {
action: punctuateSeries(actions), if (this.props.tagsAdded.length) {
count: added.length + removed.length if (this.props.tagsRemoved.length) {
}; return 'flarum-tags.forum.post_stream.added_and_removed_tags_text';
}
return 'flarum-tags.forum.post_stream.added_tags_text';
}
return 'flarum-tags.forum.post_stream.removed_tags_text';
}
descriptionData() {
const data = {};
if (this.props.tagsAdded.length) {
data.tagsAdded = app.translator.transChoice('flarum-tags.forum.post_stream.tags_text', this.props.tagsAdded.length, {
tags: tagsLabel(this.props.tagsAdded, {link: true}),
count: this.props.tagsAdded.length
});
}
if (this.props.tagsRemoved.length) {
data.tagsRemoved = app.translator.transChoice('flarum-tags.forum.post_stream.tags_text', this.props.tagsRemoved.length, {
tags: tagsLabel(this.props.tagsRemoved, {link: true}),
count: this.props.tagsRemoved.length
});
}
return data;
} }
} }