Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Use color, not colour for consistency (#20082)

Oliver Günther17257be3e0ac
diff --git a/config/locales/en.yml b/config/locales/en.yml
index da1baaa3303..78aee0b44d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -754,7 +754,7 @@ en:
dark_high_contrast: "Dark high contrast"
light: "Light"
light_high_contrast: "Light high contrast"
- sync_with_os: "Automatic (match OS colour mode)"
+ sync_with_os: "Automatic (match OS color mode)"
types:
index:
@@ -1274,9 +1274,9 @@ en:
auto_hide_popups: "Automatically hide success banners"
auto_hide_popups_caption: "When enabled, the green success banners will automatically disappear after 5 seconds."
warn_on_leaving_unsaved: "Warn me when leaving a work package with unsaved changes"
- theme: "Colour mode"
+ theme: "Color mode"
time_zone: "Time zone"
- mode_guideline: "Some modes will overwrite custom theme colours for accessibility and legibility. Please select Light mode for full custom theme support."
+ mode_guideline: "Some modes will overwrite custom theme colors for accessibility and legibility. Please select Light mode for full custom theme support."
daily_reminders: "Daily reminders"
workdays: "Working days"
version:
diff --git a/spec/features/my/interface_spec.rb b/spec/features/my/interface_spec.rb
index 6f33601d5fa..c7fc3553d69 100644
--- a/spec/features/my/interface_spec.rb
+++ b/spec/features/my/interface_spec.rb
@@ -39,40 +39,40 @@ RSpec.describe "My account Interface settings",
visit my_account_path
end
- it "allows the user to specify their preferred colour mode" do
+ it "allows the user to specify their preferred color mode" do
click_on "Interface"
- select "Light", from: "Colour mode"
+ select "Light", from: "Color mode"
click_on "Update look and feel"
expect(page).to have_css("body[data-color-mode='light'][data-light-theme='light']")
- select "Light high contrast", from: "Colour mode"
+ select "Light high contrast", from: "Color mode"
click_on "Update look and feel"
expect(page).to have_css("body[data-color-mode='light'][data-light-theme='light_high_contrast']")
- select "Dark", from: "Colour mode"
+ select "Dark", from: "Color mode"
click_on "Update look and feel"
expect(page).to have_css("body[data-color-mode='dark'][data-dark-theme='dark']")
- select "Dark high contrast", from: "Colour mode"
+ select "Dark high contrast", from: "Color mode"
click_on "Update look and feel"
expect(page).to have_css("body[data-color-mode='dark'][data-dark-theme='dark_high_contrast']")
- select "Automatic (match OS colour mode)", from: "Colour mode"
+ select "Automatic (match OS color mode)", from: "Color mode"
click_on "Update look and feel"
expect(page).to have_css("body[data-auto-theme-switcher-mode-value='sync_with_os']")
end
- describe "Automatic (match OS colour mode)" do
+ describe "Automatic (match OS color mode)" do
def set_automatic_mode_with_reload
click_on "Interface"
- select "Automatic (match OS colour mode)", from: "Colour mode"
+ select "Automatic (match OS color mode)", from: "Color mode"
click_on "Update look and feel"
end