ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

i18n: Apply code review suggestions + code cleaning

Browse Source
This commit is contained in:
Samantaz Fox 2022-01-05 23:44:36 +01:00
parent 37c953e633
commit eb7e79fdf7
No known key found for this signature in database
GPG Key ID: F42821059186176E
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/invidious/helpers/i18n.cr
View File

@ -131,15 +131,14 @@ def translate_count(locale : String, key : String, count : Int, format = NumberF
if LOCALES[locale].has_key?(key + singular_suffix) if LOCALES[locale].has_key?(key + singular_suffix)
translation = LOCALES[locale][key + singular_suffix].as_s translation = LOCALES[locale][key + singular_suffix].as_s
elsif locale != "en-US"
# Try #2: Fallback to english
translation = translate_count("en-US", key, count)
else else
# Try #2: Fallback to english (or return key we're already in english) # Return key if we're already in english, as the tranlation is missing
if locale == "en-US"
LOGGER.warn("i18n: Missing translation key \"#{key}\"") LOGGER.warn("i18n: Missing translation key \"#{key}\"")
return key return key
end end
translation = translate_count("en-US", key, count)
end
end end
case format case format

5
src/invidious/helpers/i18next.cr
View File

@ -139,10 +139,7 @@ module I18next::Plurals
self.init_rules self.init_rules
end end
def init_rules # : Hash(String, PluralForms) def init_rules
# Init
# forms = {} of String => PluralForms
# Look into sets # Look into sets
PLURAL_SETS.each do |form, langs| PLURAL_SETS.each do |form, langs|
langs.each { |lang| self.forms[lang] = form } langs.each { |lang| self.forms[lang] = form }