Commit af0a5e32 authored by Benjamin Neff's avatar Benjamin Neff

Merge pull request #7369 from svbergerem/color-themes-i18n

i18n for color themes
parents 06b61b64 7eb3dabb
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* Simplify mentions in the publisher [#7302](https://github.com/diaspora/diaspora/pull/7302) * Simplify mentions in the publisher [#7302](https://github.com/diaspora/diaspora/pull/7302)
* Remove chartbeat and mixpanel support [#7280](https://github.com/diaspora/diaspora/pull/7280) * Remove chartbeat and mixpanel support [#7280](https://github.com/diaspora/diaspora/pull/7280)
* Upgrade to jQuery 3 [#7303](https://github.com/diaspora/diaspora/pull/7303) * Upgrade to jQuery 3 [#7303](https://github.com/diaspora/diaspora/pull/7303)
* Add i18n for color themes [#7369](https://github.com/diaspora/diaspora/pull/7369)
## Bug fixes ## Bug fixes
......
...@@ -31,13 +31,13 @@ module UsersHelper ...@@ -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
......
...@@ -30,7 +30,7 @@ class User < ActiveRecord::Base ...@@ -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
......
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,12 +8,10 @@ if color_themes_file.exist? ...@@ -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
...@@ -240,6 +240,14 @@ en: ...@@ -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."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment