diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-12-07 14:42:21 -0800 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-12-10 11:08:04 -0800 |
| commit | d08d0f9f3335b2edbacf1febd4584eed9a7d1a11 (patch) | |
| tree | 7a3317d8a641b5e800460f1b7e759f4aec8d24cd /app | |
| parent | 282f48ddd1868fcd8fa2887bbaf13036c949c22d (diff) | |
Ruby intl8n for themes
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/flavours/glitch/names.yml | 6 | ||||
| -rw-r--r-- | app/javascript/flavours/vanilla/names.yml | 6 | ||||
| -rw-r--r-- | app/javascript/skins/vanilla/win95/common.scss (renamed from app/javascript/skins/vanilla/win95.scss) | 0 | ||||
| -rw-r--r-- | app/javascript/skins/vanilla/win95/names.yml | 4 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 4 |
5 files changed, 18 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/names.yml b/app/javascript/flavours/glitch/names.yml new file mode 100644 index 000000000..b3d579cb2 --- /dev/null +++ b/app/javascript/flavours/glitch/names.yml @@ -0,0 +1,6 @@ +en: + flavours: + glitch: Glitch Edition + skins: + glitch: + default: Default diff --git a/app/javascript/flavours/vanilla/names.yml b/app/javascript/flavours/vanilla/names.yml new file mode 100644 index 000000000..8816fcb3a --- /dev/null +++ b/app/javascript/flavours/vanilla/names.yml @@ -0,0 +1,6 @@ +en: + flavours: + vanilla: Vanilla Mastodon + skins: + vanilla: + default: Default diff --git a/app/javascript/skins/vanilla/win95.scss b/app/javascript/skins/vanilla/win95/common.scss index 298f6ee9d..298f6ee9d 100644 --- a/app/javascript/skins/vanilla/win95.scss +++ b/app/javascript/skins/vanilla/win95/common.scss diff --git a/app/javascript/skins/vanilla/win95/names.yml b/app/javascript/skins/vanilla/win95/names.yml new file mode 100644 index 000000000..2083084a2 --- /dev/null +++ b/app/javascript/skins/vanilla/win95/names.yml @@ -0,0 +1,4 @@ +en: + skins: + vanilla: + win95: Ｍａｓｔｏ95 diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 9564c0399..e2e48a699 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -27,8 +27,8 @@ .fields-group - if Themes.instance.flavours.size > 1 - = f.input :setting_flavour, collection: Themes.instance.flavours, label_method: lambda { |flavour| I18n.t("themes.#{flavour}", default: flavour) }, wrapper: :with_label, include_blank: false - = f.input :setting_skin, collection: Themes.instance.skins_for(current_flavour), label_method: lambda { |skin| I18n.t("themes.#{current_flavour}.skins.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false + = f.input :setting_flavour, collection: Themes.instance.flavours, label_method: lambda { |flavour| I18n.t("flavours.#{flavour}", default: flavour) }, wrapper: :with_label, include_blank: false + = f.input :setting_skin, collection: Themes.instance.skins_for(current_flavour), label_method: lambda { |skin| I18n.t("skins.#{current_flavour}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label |