From 9aa595848430313a9be69be1971242de048fd39d Mon Sep 17 00:00:00 2001 From: Goddesen Date: Tue, 31 May 2016 21:38:13 +0200 Subject: [PATCH 1/6] Added support for Norwegian (nb-NO) --- src/config.c | 1 + src/localisation/language.cpp | 2 ++ src/localisation/language.h | 1 + src/platform/windows.c | 3 +++ 4 files changed, 7 insertions(+) diff --git a/src/config.c b/src/config.c index 45cd0c1b31..d9fa2fa1c5 100644 --- a/src/config.c +++ b/src/config.c @@ -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 }; diff --git a/src/localisation/language.cpp b/src/localisation/language.cpp index 2ecc102d3d..19052c6493 100644 --- a/src/localisation/language.cpp +++ b/src/localisation/language.cpp @@ -41,6 +41,7 @@ enum { RCT2_LANGUAGE_ID_CHINESE_TRADITIONAL, RCT2_LANGUAGE_ID_12, RCT2_LANGUAGE_ID_PORTUGUESE, + RCT2_LANGUAGE_ID_NORWEGIAN, RCT2_LANGUAGE_ID_END = 255 }; @@ -99,6 +100,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_NORWEGIAN, }, // LANGUAGE_NORWEGIAN }; int gCurrentLanguage = LANGUAGE_UNDEFINED; diff --git a/src/localisation/language.h b/src/localisation/language.h index 4c4bf56037..eabc6fbb53 100644 --- a/src/localisation/language.h +++ b/src/localisation/language.h @@ -40,6 +40,7 @@ enum { LANGUAGE_RUSSIAN, LANGUAGE_CZECH, LANGUAGE_JAPANESE, + LANGUAGE_NORWEGIAN, LANGUAGE_COUNT }; diff --git a/src/platform/windows.c b/src/platform/windows.c index 8f8fd650a9..86361aad9e 100644 --- a/src/platform/windows.c +++ b/src/platform/windows.c @@ -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; } From fe3ed939a16bd0adc61ed98a92f5ca5b17b238f7 Mon Sep 17 00:00:00 2001 From: Goddesen Date: Tue, 31 May 2016 21:39:00 +0200 Subject: [PATCH 2/6] Added Goddesen to list of translators --- contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.md b/contributors.md index 2fd5359d95..e989a865a6 100644 --- a/contributors.md +++ b/contributors.md @@ -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) From 20a4285cbf6481c6f90697ae346c8cb0bbfb3a37 Mon Sep 17 00:00:00 2001 From: Goddesen Date: Tue, 31 May 2016 21:51:29 +0200 Subject: [PATCH 3/6] Added Norwegian translation to changelog --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2a8fce60fe..d64824c746 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -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 From b27aa56cffe3b6628ca5993a9afa1e82be7a03c6 Mon Sep 17 00:00:00 2001 From: Goddesen Date: Wed, 1 Jun 2016 00:13:12 +0200 Subject: [PATCH 4/6] Removed Norwegian ID enum member, replaced spaces with tabs --- src/localisation/language.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/localisation/language.cpp b/src/localisation/language.cpp index 19052c6493..43c9e635f0 100644 --- a/src/localisation/language.cpp +++ b/src/localisation/language.cpp @@ -41,7 +41,6 @@ enum { RCT2_LANGUAGE_ID_CHINESE_TRADITIONAL, RCT2_LANGUAGE_ID_12, RCT2_LANGUAGE_ID_PORTUGUESE, - RCT2_LANGUAGE_ID_NORWEGIAN, RCT2_LANGUAGE_ID_END = 255 }; @@ -100,7 +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_NORWEGIAN, }, // LANGUAGE_NORWEGIAN + { "nb-NO", "Norwegian", "Norsk", FONT_OPENRCT2_SPRITE, RCT2_LANGUAGE_ID_ENGLISH_UK, }, // LANGUAGE_NORWEGIAN }; int gCurrentLanguage = LANGUAGE_UNDEFINED; From c60fce354938a5cde5635a49a934ea2d0580bf67 Mon Sep 17 00:00:00 2001 From: Goddesen Date: Wed, 1 Jun 2016 00:25:28 +0200 Subject: [PATCH 5/6] Substituted tabs for spaces --- src/config.c | 2 +- src/localisation/language.h | 2 +- src/platform/windows.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.c b/src/config.c index d9fa2fa1c5..d03be377b4 100644 --- a/src/config.c +++ b/src/config.c @@ -142,7 +142,7 @@ config_enum_definition _languageEnum[] = { { "ru-RU", LANGUAGE_RUSSIAN }, { "cs-CZ", LANGUAGE_CZECH }, { "ja-JP", LANGUAGE_JAPANESE }, - { "nb-NO", LANGUAGE_NORWEGIAN }, + { "nb-NO", LANGUAGE_NORWEGIAN }, END_OF_ENUM }; diff --git a/src/localisation/language.h b/src/localisation/language.h index eabc6fbb53..8e2d1f8511 100644 --- a/src/localisation/language.h +++ b/src/localisation/language.h @@ -40,7 +40,7 @@ enum { LANGUAGE_RUSSIAN, LANGUAGE_CZECH, LANGUAGE_JAPANESE, - LANGUAGE_NORWEGIAN, + LANGUAGE_NORWEGIAN, LANGUAGE_COUNT }; diff --git a/src/platform/windows.c b/src/platform/windows.c index 86361aad9e..262ee21903 100644 --- a/src/platform/windows.c +++ b/src/platform/windows.c @@ -875,9 +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; - } + else if (strcmp(langCode, "NOR") == 0){ + return LANGUAGE_NORWEGIAN; + } return LANGUAGE_UNDEFINED; } From e9e93cb60c0d43797478ebbb100c19573233f9cc Mon Sep 17 00:00:00 2001 From: Goddesen Date: Wed, 1 Jun 2016 18:40:44 +0200 Subject: [PATCH 6/6] Added space delimiter for Swedish currency, removed punctuation mark. --- src/localisation/currency.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/localisation/currency.c b/src/localisation/currency.c index 10986967ae..cc74aa051d 100644 --- a/src/localisation/currency.c +++ b/src/localisation/currency.c @@ -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