diff options
author | Fire Demon <firedemon@creature.cafe> | 2020-07-13 21:59:36 -0500 |
---|---|---|
committer | Fire Demon <firedemon@creature.cafe> | 2020-08-30 05:41:03 -0500 |
commit | 3367f3d12f8d1bc11bbc01f9f1be8cee01b21a44 (patch) | |
tree | 1daa46b9043bed052bb3d0a6fc96ce9c577d4dda /app/javascript | |
parent | e82adc250fc201f8d4638a22207183a4ebdc780e (diff) |
Move Monsterfork locale modifications into own directories
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/flavours/glitch/locales/en.js | 3 | ||||
-rw-r--r-- | app/javascript/locales/monsterfork/en.json | 3 | ||||
-rw-r--r-- | app/javascript/mastodon/locales/en.json | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/locales/en.js b/app/javascript/flavours/glitch/locales/en.js index 90e924d4a..11bdccfde 100644 --- a/app/javascript/flavours/glitch/locales/en.js +++ b/app/javascript/flavours/glitch/locales/en.js @@ -1,4 +1,5 @@ import inherited from 'mastodon/locales/en.json'; +import monsterfork from 'locales/monsterfork/en.json'; const messages = { 'getting_started.open_source_notice': 'Glitchsoc is free open source software forked from {Mastodon}. You can contribute or report issues on GitHub at {github}.', @@ -64,4 +65,4 @@ const messages = { 'advanced_options.threaded_mode.tooltip': 'Threaded mode enabled', }; -export default Object.assign({}, inherited, messages); +export default Object.assign({}, inherited, messages, monsterfork); diff --git a/app/javascript/locales/monsterfork/en.json b/app/javascript/locales/monsterfork/en.json new file mode 100644 index 000000000..24f9989f8 --- /dev/null +++ b/app/javascript/locales/monsterfork/en.json @@ -0,0 +1,3 @@ +{ + "status.edited": "{count, plural, one {# edit} other {# edits}} · last update: {updated_at}" +} \ No newline at end of file diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 7702c8be1..025ae6e7d 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -380,7 +380,6 @@ "status.delete": "Delete", "status.detailed_status": "Detailed conversation view", "status.direct": "Direct message @{name}", - "status.edited": "{count, plural, one {# edit} other {# edits}} · last update: {updated_at}", "status.embed": "Embed", "status.favourite": "Favourite", "status.filtered": "Filtered", |