nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i18n for color themes

Browse source
This commit is contained in:
Steffen van Bergerem 2017-03-16 12:25:41 +01:00
parent 6657fd51fa
commit 7eb3dabb44
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
5 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/users_helper.rb
View file

@ -31,13 +31,13 @@ module UsersHelper
# specified from AVAILABLE_COLOR_THEMES in # specified from AVAILABLE_COLOR_THEMES in
# config/initializers/color_themes.rb. # config/initializers/color_themes.rb.
# #
# @example if AVAILABLE_COLOR_THEMES = {"original"=>"Original dark", "dark_green" => "Dark green"} # @example if AVAILABLE_COLOR_THEMES = ["original", "dark_green"]
# available_color_themes # available_color_themes
# #=> [["Original dark", "original"], ["Dark green", "dark_green"]] # #=> [["Original gray", "original"], ["Dark green", "dark_green"]]
def available_color_themes def available_color_themes
opts = [] opts = []
AVAILABLE_COLOR_THEMES.map do |theme_code, theme_name| AVAILABLE_COLOR_THEMES.map do |theme_code|
opts << [theme_name, theme_code] opts << [I18n.t("color_themes.#{theme_code}"), theme_code]
end end
opts opts
end end

2
app/models/user.rb
View file

@ -30,7 +30,7 @@ class User < ActiveRecord::Base
validates_length_of :username, :maximum => 32 validates_length_of :username, :maximum => 32
validates_exclusion_of :username, :in => AppConfig.settings.username_blacklist validates_exclusion_of :username, :in => AppConfig.settings.username_blacklist
validates_inclusion_of :language, :in => AVAILABLE_LANGUAGE_CODES validates_inclusion_of :language, :in => AVAILABLE_LANGUAGE_CODES
validates :color_theme, inclusion: {in: AVAILABLE_COLOR_THEME_CODES}, allow_blank: true validates :color_theme, inclusion: {in: AVAILABLE_COLOR_THEMES}, allow_blank: true
validates_format_of :unconfirmed_email, :with => Devise.email_regexp, :allow_blank => true validates_format_of :unconfirmed_email, :with => Devise.email_regexp, :allow_blank => true
validate :unconfirmed_email_quasiuniqueness validate :unconfirmed_email_quasiuniqueness

12
config/color_themes.yml
View file

@ -1,7 +1,7 @@
available: available:
original: "Original gray" - original
original_white: "Original white background" - original_white
dark_green: "Dark green" - dark_green
magenta: "Magenta" - magenta
egyptian_blue: "Egyptian blue" - egyptian_blue
dark: "Dark" - dark

8
config/initializers/color_themes.rb
View file

@ -8,12 +8,10 @@ if color_themes_file.exist?
# else include the original theme. # else include the original theme.
AVAILABLE_COLOR_THEMES = AVAILABLE_COLOR_THEMES =
if color_themes["available"].length > 0 if color_themes["available"].length > 0
color_themes["available"] color_themes["available"].freeze
else else
{"original" => "Original gray"} ["original"].freeze
end end
else else
AVAILABLE_COLOR_THEMES = {"original" => "Original gray"}.freeze AVAILABLE_COLOR_THEMES = ["original"].freeze
end end
# Get all codes from available themes into a separate variable, so that they can be called easier.
AVAILABLE_COLOR_THEME_CODES = AVAILABLE_COLOR_THEMES.keys

8
config/locales/diaspora/en.yml
View file

@ -240,6 +240,14 @@ en:
post_something: "Post to diaspora*" post_something: "Post to diaspora*"
explanation: "Post to diaspora* from anywhere by bookmarking this link => %{link}." explanation: "Post to diaspora* from anywhere by bookmarking this link => %{link}."
color_themes:
dark: "Dark"
dark_green: "Dark green"
egyptian_blue: "Egyptian blue"
magenta: "Magenta"
original: "Original gray"
original_white: "Original white background"
comments: comments:
create: create:
error: "Failed to comment." error: "Failed to comment."