about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authormayaeh <mayaeh@marimo-net.org>2019-10-01 08:20:22 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-10-01 01:20:22 +0200
commitb258583d2becfb1d1b434a2368fac627069bed0b (patch)
treee926c7262c5ef61494f3a0bf41cf3933ecdfd70d /config
parentf7c146a9e11389e208fe61ab8e6f5e3d3b43ddfb (diff)
Fix hashtag link to directory in AdminUI (#12005)
* Fixed not to generate link if no user used hashtag in directory

* Added missing translation for AdminUI custom emojis

* run yarn manage:translations en
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 82e20cb1f..51b0f51d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -240,6 +240,7 @@ en:
       delete: Delete
       destroyed_msg: Emojo successfully destroyed!
       disable: Disable
+      disabled: Disabled
       disabled_msg: Successfully disabled that emoji
       emoji: Emoji
       enable: Enable