summaryrefslogtreecommitdiffstats
path: root/options/locale
diff options
context:
space:
mode:
authorJohn Olheiser <42128690+jolheiser@users.noreply.github.com>2019-02-16 11:33:09 -0600
committerLauris BH <lauris@nix.lv>2019-02-16 19:33:09 +0200
commit0b72c00fadcacda920893c991cd858a3d6dd52c7 (patch)
treeb198df05a5d275733f2ff2d6c9d2154c0ac0271d /options/locale
parent8c8ac1a16260c075e854bd370812284e0121613e (diff)
downloadgitea-0b72c00fadcacda920893c991cd858a3d6dd52c7.tar.gz
gitea-0b72c00fadcacda920893c991cd858a3d6dd52c7.zip
Allow labels to contain emoji (#6063)
* Add emoji to labels Minor cleanup of tribute code in footer.tmpl Signed-off-by: jolheiser <john.olheiser@gmail.com> * Quick find/replace in other i18n files containing label translations Signed-off-by: jolheiser <john.olheiser@gmail.com> * Revert "Quick find/replace in other i18n files containing label translations" This reverts commit ec3e1a3a1775989301bb2c1cd08e8871b317688d. * Add style to overwrite emoji height in labels * Revert Makefile change that makes Windows work
Diffstat (limited to 'options/locale')
-rw-r--r--options/locale/locale_en-US.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ebbf73b05d..1e708b1762 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -690,8 +690,8 @@ issues.label_templates.info = No labels exist yet. Create a label with 'New Labe
issues.label_templates.helper = Select a label set
issues.label_templates.use = Use Label Set
issues.label_templates.fail_to_load_file = Failed to load label template file '%s': %v
-issues.add_label_at = added the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
-issues.remove_label_at = removed the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
+issues.add_label_at = added the <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> label %s
+issues.remove_label_at = removed the <div class="ui label has-emoji" style="color: %s\; background-color: %s">%s</div> label %s
issues.add_milestone_at = `added this to the <b>%s</b> milestone %s`
issues.change_milestone_at = `modified the milestone from <b>%s</b> to <b>%s</b> %s`
issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`