Ticket #2533: lng_verification.2.diff

File lng_verification.2.diff, 3.1 KB (added by sanderd17, 10 years ago)

  • binaries/data/mods/public/gui/locale/locale_advanced.js

     
    7070
    7171    var resultingLocaleTmp = languageList.list_data[languageList.selected];
    7272   
    73     if (scriptInput.caption != "")
    74         resultingLocaleTmp = resultingLocaleTmp + "_" + scriptInput.caption;
    75    
    7673    if (countryList.selected != -1 && countryList.list_data[countryList.selected] != translateWithContext("localeCountry", "None"))
    7774        resultingLocaleTmp = resultingLocaleTmp + "_" + countryList.list_data[countryList.selected];
    7875

  • binaries/data/mods/public/gui/locale/locale_advanced.xml

     
    3131            </object>
    3232           
    3333            <object type="text" size="5 110 50% 135" style="ModernLabelText" text_align="left">
    34                 <translatableAttribute id="caption">Script:</translatableAttribute>
     34                <translatableAttribute id="caption">Script (unused):</translatableAttribute>
    3535            </object>
    3636            <object name="scriptInput" size="50%+10 110 100% 135" type="input" style="ModernInput">
    37                 <translatableAttribute id="tooltip">Optional four-letter script code part following the language code (as listed in ISO 15924)</translatableAttribute>
     37                <translatableAttribute id="tooltip">Not implemented yet.<!--Optional four-letter script code part following the language code (as listed in ISO 15924)--></translatableAttribute>
    3838            </object>
    3939           
    4040            <object type="text" size="5 140 50% 165" style="ModernLeftLabelText">

  • source/i18n/L10n.cpp

     
    9797    return ValidateLocale(Locale::createCanonical(localeCode.c_str()));
    9898}
    9999
    100 // Returns true if both of these conditions are true:
    101 //  1. ICU has resources for that locale (which also ensures it's a valid locale string)
    102 //  2. Either a dictionary for language_country or for language is available.
     100// Returns true if a dictionary for language_country or for language is available.
     101// Will warn the user if ICU doesn't have resources for that locale
     102// (which also ensures it's a valid locale string)
    103103bool L10n::ValidateLocale(Locale locale)
    104104{
    105105    int32_t count;
    … …  
    114114        }
    115115    }
    116116    if(!icuSupported)
    117         return false;
     117        LOGWARNING(L"Your locale isn't available in the localisation library we use (ICU). \nIf you know your language code is correct, please head over to the ICU bug tracker (http://bugs.icu-project.org/trac),\ncheck if it has been reported already, and if not, report your problem.\nYour locale dependant data (like date and time notations) will be in a different language");
    118118   
    119119    for (std::vector<Locale*>::iterator iterator = availableLocales.begin(); iterator != availableLocales.end(); ++iterator)
    120120    {