Skip to content

Node and PluralRules: use supported locales in place of obsolete locales #380

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

Merged
sven-oly merged 1 commit into from
Jan 8, 2025
Merged

Node and PluralRules: use supported locales in place of obsolete locales #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 26 additions & 13 deletions executors/node/plural_rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,38 @@ module.exports = {
test_options['type'] = plural_type;
}

let actual_locale;
try {
const supported_locales =
Intl.PluralRules.supportedLocalesOf(locale, test_options);

if (!supported_locales.includes(locale)) {

return {"label": label,
"error" : "unusupported",
"unsupported": "unsupported_locale",
"error_detail": {'unsupported_locale': locale,
'supported_locals': supported_locales,
'test_options': test_options
}
};
if (supported_locales.includes(locale)) {
actual_locale = locale;
} else {
if (supported_locales) {
actual_locale = supported_locales[0];
}
if (actual_locale == undefined) {
// No, there's no good substitute.
Comment on lines 48 to +58
Copy link
Member

@sffc sffc Jan 8, 2025

Choose a reason for hiding this comment

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

This code is more complex than it needs to be, but I believe it is technically correct.

return {"label": label,
"error" : "unusupported",
"unsupported": "unsupported_locale",
"error_detail": {'unsupported_locale': locale,
'supported_locals': supported_locales,
'test_options': test_options
}
};
}
}
} catch (error) {
// Ignore for now.
/* Something is wrong with supporteLocalesOf */
return_json['error'] = 'supporteLocalesOf: ' + error.message;
return_json['options'] = test_options;
return return_json;
}

let list_formatter;
try {
p_rules = new Intl.PluralRules(locale, test_options);
p_rules = new Intl.PluralRules(actual_locale, test_options);
} catch (error) {
/* Something is wrong with the constructor */
return_json['error'] = 'CONSTRUCTOR: ' + error.message;
Expand All @@ -80,6 +90,9 @@ module.exports = {
return_json['error'] =
'PLURAL RULES UNKNOWN ERROR: ' + error.message;
}
if (actual_locale != locale) {
return_json['actual_locale'] = actual_locale;
}
return return_json;
}
}
4 changes: 4 additions & 0 deletions schema/plural_rules/result_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
"input_data": {
"type": "string",
"description": "Information provided to the executor"
},
"actual_locale": {
"type": "string",
"description": "If present, the substitute locale actually used in the test"
}
}
},
Expand Down
Loading