Merge pull request #3787 from Goddesen/nb-NO_support

Support for nb-NO
This commit is contained in:
Michael Steenbeek 2016-06-02 19:41:23 +02:00
commit 768e915eed
7 changed files with 9 additions and 1 deletions

View File

@ -102,6 +102,7 @@ Includes all git commit authors. Aliases are GitHub user names.
* Spanish - (mdtrooper), Josué Acevedo (Wirlie), Daniel Trujillo Viedma (gdabi); small fixes: (teapartycthulu)
* Swedish - (Jinxit), (mharrys), (Slimeyo), (Nubbie)
* Traditional Chinese - Harry Lam (daihakken)
* Norwegian - (Goddesen)
## Graphics
* OpenRCT2 Logo - Yannic Geurts (xzbobzx)

View File

@ -6,6 +6,7 @@
- Feature: Allow setting ownership of map edges.
- Feature: Allow up to 255 cars per train.
- Feature: Importing SV4 and SC4 files with rides.
- Feature: Added Norwegian translation
- Removed: BMP screenshots.
- Technical: [#3699] Assymmetric-key-based authorisation and assignment storage
- Technical: Mulitplayer groups are now stored in JSON format

View File

@ -142,6 +142,7 @@ config_enum_definition _languageEnum[] = {
{ "ru-RU", LANGUAGE_RUSSIAN },
{ "cs-CZ", LANGUAGE_CZECH },
{ "ja-JP", LANGUAGE_JAPANESE },
{ "nb-NO", LANGUAGE_NORWEGIAN },
END_OF_ENUM
};

View File

@ -26,7 +26,7 @@ const currency_descriptor CurrencyDescriptors[CURRENCY_END] = {
{ "ESP", 10, CURRENCY_SUFFIX, "Pts", CURRENCY_SUFFIX, "Pts", STR_PESETA }, // Spanish Peseta
{ "ITL", 1000, CURRENCY_PREFIX, "L", CURRENCY_PREFIX, "L", STR_LIRA }, // Italian Lira
{ "NLG", 10, CURRENCY_PREFIX, "\xC6\x92", CURRENCY_PREFIX, "fl.", STR_GUILDERS }, // Dutch Guilder
{ "SEK", 10, CURRENCY_SUFFIX, "kr.", CURRENCY_SUFFIX, "kr.", STR_KRONA }, // Swedish Krona
{ "SEK", 10, CURRENCY_SUFFIX, " kr", CURRENCY_SUFFIX, " kr", STR_KRONA }, // Swedish Krona
{ "EUR", 10, CURRENCY_PREFIX, "\xE2\x82\xAC", CURRENCY_SUFFIX, "EUR", STR_EUROS }, // Euro
{ "KRW", 10000, CURRENCY_PREFIX, "\xE2\x82\xA9", CURRENCY_PREFIX, "W", STR_WON }, // South Korean Won
{ "RUB", 1000, CURRENCY_PREFIX, "R ", CURRENCY_PREFIX, "R ", STR_ROUBLE }, // Russian Rouble

View File

@ -99,6 +99,7 @@ const language_descriptor LanguagesDescriptors[LANGUAGE_COUNT] = {
{ "ru-RU", "Russian", "Russian", &TTFFontArial, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_RUSSIAN
{ "cs-CZ", "Czech", "Czech", &TTFFontArial, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_CZECH
{ "ja-JP", "Japanese", "Japanese", &TTFFontMSGothic, RCT2_LANGUAGE_ID_ENGLISH_UK }, // LANGUAGE_JAPANESE
{ "nb-NO", "Norwegian", "Norsk", FONT_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_ENGLISH_UK, }, // LANGUAGE_NORWEGIAN
};
int gCurrentLanguage = LANGUAGE_UNDEFINED;

View File

@ -40,6 +40,7 @@ enum {
LANGUAGE_RUSSIAN,
LANGUAGE_CZECH,
LANGUAGE_JAPANESE,
LANGUAGE_NORWEGIAN,
LANGUAGE_COUNT
};

View File

@ -875,6 +875,9 @@ uint16 platform_get_locale_language()
else if (strcmp(langCode, "FIN") == 0){
return LANGUAGE_FINNISH;
}
else if (strcmp(langCode, "NOR") == 0){
return LANGUAGE_NORWEGIAN;
}
return LANGUAGE_UNDEFINED;
}