Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Emoji sets shouldn't be root level keys

This commit is contained in:
Robin Ward 2016-07-22 15:27:51 -04:00
parent da27237240
commit 944b2aabfe
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/emoji_set_site_setting.rb
View File

@ -29,11 +29,11 @@ class EmojiSetSiteSetting < EnumSiteSetting
def self.values def self.values
@values ||= [ @values ||= [
{ name: 'apple_international', value: 'apple' }, { name: 'emoji_set.apple_international', value: 'apple' },
{ name: 'google', value: 'google' }, { name: 'emoji_set.google', value: 'google' },
{ name: 'twitter', value: 'twitter' }, { name: 'emoji_set.twitter', value: 'twitter' },
{ name: 'emoji_one', value: 'emoji_one' }, { name: 'emoji_set.emoji_one', value: 'emoji_one' },
{ name: 'win10_emoji', value: 'win10' } { name: 'emoji_set.win10', value: 'win10' }
] ]
end end

11
config/locales/client.en.yml
View File

@ -995,11 +995,12 @@ en:
title: "with GitHub" title: "with GitHub"
message: "Authenticating with GitHub (make sure pop up blockers are not enabled)" message: "Authenticating with GitHub (make sure pop up blockers are not enabled)"
apple_international: "Apple/International" emoji_set:
google: "Google" apple_international: "Apple/International"
twitter: "Twitter" google: "Google"
emoji_one: "Emoji One" twitter: "Twitter"
win10_emoji: "Win10" emoji_one: "Emoji One"
win10: "Win10"
shortcut_modifier_key: shortcut_modifier_key:
shift: 'Shift' shift: 'Shift'