treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fixed a name + localizations

lolsob-rspec
kibigo! 2017-12-04 00:19:39 -08:00
parent 3760da1321
commit 935946020f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/preferences/show.html.haml
View File

@ -26,7 +26,7 @@
%h4= t 'preferences.web' %h4= t 'preferences.web'
.fields-group .fields-group
- if Themes.instance.names.size > 1 - 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_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_theme), label_method: lambda { |skin| I18n.t("themes.#{current_theme}.skins.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false = f.input :setting_skin, collection: Themes.instance.skins_for(current_theme), label_method: lambda { |skin| I18n.t("themes.#{current_theme}.skins.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false

6
config/locales/simple_form.en.yml
View File

@ -13,8 +13,8 @@ en:
note: note:
one: <span class="note-counter">1</span> character left one: <span class="note-counter">1</span> character left
other: <span class="note-counter">%{count}</span> characters left other: <span class="note-counter">%{count}</span> characters left
setting_noindex: Affects your public profile and status pages
setting_flavour: Affects how Mastodon looks when you're logged in from any device setting_flavour: Affects how Mastodon looks when you're logged in from any device
setting_noindex: Affects your public profile and status pages
setting_skin: Reskins the selected Mastodon flavour setting_skin: Reskins the selected Mastodon flavour
imports: imports:
data: CSV file exported from another Mastodon instance data: CSV file exported from another Mastodon instance
@ -44,11 +44,11 @@ en:
setting_default_privacy: Post privacy setting_default_privacy: Post privacy
setting_default_sensitive: Always mark media as sensitive setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot setting_delete_modal: Show confirmation dialog before deleting a toot
setting_flavour: Mastodon Flavour
setting_noindex: Opt-out of search engine indexing setting_noindex: Opt-out of search engine indexing
setting_reduce_motion: Reduce motion in animations setting_reduce_motion: Reduce motion in animations
setting_system_font_ui: Use system's default font
setting_flavour: Mastodon Flavour
setting_skin: Skin setting_skin: Skin
setting_system_font_ui: Use system's default font
setting_unfollow_modal: Show confirmation dialog before unfollowing someone setting_unfollow_modal: Show confirmation dialog before unfollowing someone
severity: Severity severity: Severity
type: Import type type: Import type