Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OP#59913] Add couple missing locale keys #17357

Draft
wants to merge 12 commits into
base: dev
Choose a base branch
from
Draft

[OP#59913] Add couple missing locale keys #17357

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aed51e5
Add missing ldap_auth_source.filter_string attribute
top4ek Dec 4, 2024
86d6259
Add missing EN locale for Storage label
top4ek Dec 5, 2024
5407042
Fix untranslated enabled form label
top4ek Dec 10, 2024
5470650
Fix untranslated administrator attribute form label
top4ek Dec 10, 2024
11bcd92
Move untranslated CORS title
top4ek Dec 10, 2024
f9cc735
Fix untranslated default cost type label
top4ek Dec 10, 2024
6875575
Fix untranslated scopes label in oauth app
top4ek Dec 10, 2024
9805d01
Fix untranslated client credentials title
top4ek Dec 10, 2024
90ab720
Quotes styles
top4ek Dec 10, 2024
11e6db3
LDAP groups auth_source titles
top4ek Dec 11, 2024
8e97cf7
Add L2R label translation for CF
top4ek Dec 11, 2024
55afede
Review changes
top4ek Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/admin/settings/api_settings/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ See COPYRIGHT and LICENSE files for more details.
</section>
<section class="form--section">
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend">Cross-Origin Resource Sharing (CORS)</legend>
<legend class="form--fieldset-legend"><%= I18n.t("setting_apiv3_cors_title")</legend>
</fieldset>
<div class="form--field">
<%= setting_check_box :apiv3_cors_enabled %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/oauth/applications/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ See COPYRIGHT and LICENSE files for more details.

<% if Doorkeeper.configuration.scopes.all.length > 1 %>
<div class="form--field">
<label class="form--label">Scopes:</label>
<label class="form--label"><%= t("oauth.application.scopes") %></label>
<% Doorkeeper.configuration.scopes.each do |scope| %>
<div class="form--field-container -vertical">
<label class="form--label-with-check-box">
Expand All @@ -78,7 +78,7 @@ See COPYRIGHT and LICENSE files for more details.
</span>
</div>
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend">Client credentials</legend>
<legend class="form--fieldset-legend"><%= t("oauth.application.client_credentials") %></legend>
<p>
<%= t('oauth.client_credentials_impersonation_html',
client_credentials_flow_link: static_link_to(:client_credentials_code_flow),
Expand Down
6 changes: 6 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,7 @@ en:
is_required: "Required"
max_length: "Maximum length"
min_length: "Minimum length"
content_right_to_left: "Left-to-Right content"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you double check that the translation is correct? The key is "right-to-left", but the translation is "left-to-right".

multi_value: "Allow multi-select"
possible_values: "Possible values"
regexp: "Regular expression"
Expand Down Expand Up @@ -882,6 +883,8 @@ en:
attr_lastname: "Lastname attribute"
attr_login: "Username attribute"
attr_mail: "Email attribute"
filter_string: "Filter string"
admin: "Administrator"
base_dn: "Base DN"
host: "Host"
onthefly: "Automatic user creation"
Expand Down Expand Up @@ -3417,6 +3420,7 @@ en:

search_input_placeholder: "Search ..."

setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)"
setting_apiv3_cors_enabled: "Enable CORS"
setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins"
setting_apiv3_cors_origins_text_html: >
Expand Down Expand Up @@ -4240,6 +4244,8 @@ en:
builtin: Built-in instance application
confidential: Confidential
singular: "OAuth application"
scope: "Scopes:"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not an error introduced in this PR, but I noticed that it seemed inconsistent to see only scopes with a trailing : here. And indeed it's also inconsistent in the UI:

image

I'd suggest to drop the colon here, so that it doesn't slip into all translations before being fixed.

client_credentials: "Client credentials"
plural: "OAuth applications"
named: "OAuth application '%{name}'"
new: "New OAuth application"
Expand Down
1 change: 1 addition & 0 deletions modules/costs/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ en:
cost_type:
unit: "Unit name"
unit_plural: "Pluralized unit name"
default: "Cost type by default"
work_package:
costs_by_type: "Spent units"
labor_costs: "Labor costs"
Expand Down
2 changes: 2 additions & 0 deletions modules/ldap_groups/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ en:
attributes:
ldap_groups/synchronized_group:
dn: 'DN'
auth_source: 'Auth source'
ldap_auth_source: 'LDAP connection'
sync_users: 'Sync users'
ldap_groups/synchronized_filter:
filter_string: 'LDAP filter'
auth_source: 'Auth source'
ldap_auth_source: 'LDAP connection'
group_name_attribute: "Group name attribute"
sync_users: 'Sync users'
Expand Down
2 changes: 2 additions & 0 deletions modules/storages/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ en:
name: Name
provider_type: Provider type
tenant: Directory (tenant) ID
storages/project_storage:
storage: "Storage"
errors:
messages:
invalid_host_url: is not a valid URL.
Expand Down
1 change: 1 addition & 0 deletions modules/webhooks/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ en:
url: 'Payload URL'
secret: 'Signature secret'
events: 'Events'
enabled: 'Enabled'
projects: 'Enabled projects'
webhooks/log:
event_name: 'Event name'
Expand Down
Loading