Skip to content

Commit 9e9f78e

Browse files
authored
Merge pull request #399 from zendesk/update-translations
[APPS-7690][LAB] Update translations
2 parents 6d9e8cb + 6fee53d commit 9e9f78e

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

config/locales/en.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ en:
145145
other: Unsupported MIME types detected in %{file_names}.
146146
multiple_channel_integrations: Specifying multiple channel integrations
147147
in requirements.json is not supported.
148-
oauth_parameter_required: "Please upgrade to our new oauth format. Learn more: %{link}"
149148
invalid_cr_schema_keys:
150149
one: 'Custom resources schema contains an invalid key: %{invalid_keys}'
151150
other: 'Custom resources schema contains invalid keys: %{invalid_keys}'
@@ -161,6 +160,8 @@ en:
161160
missing:
162161
one: 'Missing required oauth field in manifest: %{missing_keys}'
163162
other: 'Missing required oauth fields in manifest: %{missing_keys}'
163+
oauth_parameter_required: 'Missing parameter of type ''oauth''. Learn
164+
about oauth property in manifest: %{link}'
164165
too_many_oauth_parameters: 'Too many parameters with type ''oauth'': one
165166
permitted'
166167
missing_source: Could not find app.js
@@ -206,10 +207,11 @@ en:
206207
for %{product}: %{missing_key}'
207208
products_do_not_match_manifest_products: Products in manifest (%{manifest_products})
208209
do not match products in translations (%{translation_products})
209-
password_parameter_deprecated: 'Password parameter type is deprecated and will not
210-
be accepted in the future. Use Basic Access Authentication instead. Learn more: %{link}.'
211210
insecure_token_parameter_in_manifest: 'Make sure to set secure to true
212211
when using keys in Settings. Learn more: %{link}'
212+
password_parameter_deprecated: 'Password parameter type is deprecated
213+
and will not be accepted in the future. Use Basic Access Authentication
214+
instead. Learn more: %{link}.'
213215
default_secure_or_hidden_parameter_in_manifest: Default values for secure
214216
or hidden parameters are not stored securely. Be sure to review them
215217
and confirm they do not contain sensitive data

config/locales/translations/zendesk_apps_support.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,10 @@ parts:
380380
key: "txt.apps.admin.error.app_build.oauth_keys.missing.other"
381381
title: "App builder job: missing oauth fields error"
382382
value: "Missing required oauth fields in manifest: %{missing_keys}"
383+
- translation:
384+
key: "txt.apps.admin.error.app_build.oauth_parameter_required"
385+
title: "App builder job: missing oauth parameter"
386+
value: "Missing parameter of type 'oauth'. Learn about oauth property in manifest: %{link}"
383387
- translation:
384388
key: "txt.apps.admin.error.app_build.too_many_oauth_parameters"
385389
title: "App builder job: upload error when there are more than one 'oauth'"

spec/validations/manifest_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ def create_package(parameter_hash)
556556
'access_token_uri' => '4'
557557
}
558558
}
559-
expect(@package).to have_error(/Please upgrade to our new oauth format/)
559+
expect(@package).to have_error(/Missing parameter of type 'oauth'./)
560560
end
561561
end
562562
end

0 commit comments

Comments
 (0)