From 6d4b4dd9fcf6ee5bb875b863922fc154990e0ca4 Mon Sep 17 00:00:00 2001 From: eouia Date: Mon, 4 Oct 2021 11:05:33 +0200 Subject: [PATCH 1/5] fix language Code kr->ko and add missed translation --- translations/ko.json | 42 ++++++++++++++++++++++++++++++++++++++++++ translations/kr.json | 11 +++++++++++ 2 files changed, 53 insertions(+) create mode 100644 translations/ko.json diff --git a/translations/ko.json b/translations/ko.json new file mode 100644 index 00000000..f5b88985 --- /dev/null +++ b/translations/ko.json @@ -0,0 +1,42 @@ +{ + "LOADING": "로드 중 …", + + "TODAY": "오늘", + "TOMORROW": "내일", + "DAYAFTERTOMORROW": "모레", + "RUNNING": "종료 일", + "EMPTY": "예정된 이벤트가 없습니다.", + "WEEK": "{weekNumber}주차", + + "N": "북풍", + "NNE": "북북동풍", + "NE": "북동풍", + "ENE": "동북동풍", + "E": "동풍", + "ESE": "동남동풍", + "SE": "남동풍", + "SSE": "남남동풍", + "S": "남풍", + "SSW": "남남서풍", + "SW": "남서풍", + "WSW": "서남서풍", + "W": "서풍", + "WNW": "서북서풍", + "NW": "북서풍", + "NNW": "북북서풍", + + "FEELS": "체감온도 {DEGREE}", + "PRECIP": "PoP", + + "MODULE_CONFIG_CHANGED": "모듈 {MODULE_NAME}의 설정값이 바뀌었습니다.\n매뉴얼을 참고하세요.", + "MODULE_CONFIG_ERROR": "에러 : {MODULE_NAME} - {ERROR}", + "MODULE_ERROR_MALFORMED_URL": "잘못된 URL 형식입니다.", + "MODULE_ERROR_NO_CONNECTION": "인터넷이 연결되지 않았습니다.", + "MODULE_ERROR_UNAUTHORIZED": "인증이 실패했습니다.", + "MODULE_ERROR_UNSPECIFIED": "상세 내용은 로그를 확인하세요.", + + "UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.", + "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.", + "UPDATE_INFO_SINGLE": "설치할 {COMMIT_COUNT} commit 는 {BRANCH_NAME} 분기에 해당됩니다.", + "UPDATE_INFO_MULTIPLE": "설치할 {COMMIT_COUNT} commits 는 {BRANCH_NAME} 분기에 해당됩니다." +} diff --git a/translations/kr.json b/translations/kr.json index 54ee8d20..f5b88985 100644 --- a/translations/kr.json +++ b/translations/kr.json @@ -6,6 +6,7 @@ "DAYAFTERTOMORROW": "모레", "RUNNING": "종료 일", "EMPTY": "예정된 이벤트가 없습니다.", + "WEEK": "{weekNumber}주차", "N": "북풍", "NNE": "북북동풍", @@ -24,6 +25,16 @@ "NW": "북서풍", "NNW": "북북서풍", + "FEELS": "체감온도 {DEGREE}", + "PRECIP": "PoP", + + "MODULE_CONFIG_CHANGED": "모듈 {MODULE_NAME}의 설정값이 바뀌었습니다.\n매뉴얼을 참고하세요.", + "MODULE_CONFIG_ERROR": "에러 : {MODULE_NAME} - {ERROR}", + "MODULE_ERROR_MALFORMED_URL": "잘못된 URL 형식입니다.", + "MODULE_ERROR_NO_CONNECTION": "인터넷이 연결되지 않았습니다.", + "MODULE_ERROR_UNAUTHORIZED": "인증이 실패했습니다.", + "MODULE_ERROR_UNSPECIFIED": "상세 내용은 로그를 확인하세요.", + "UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.", "UPDATE_INFO_SINGLE": "설치할 {COMMIT_COUNT} commit 는 {BRANCH_NAME} 분기에 해당됩니다.", From 7a9f9b2705ce67625ed9b7126abafd24df046c5b Mon Sep 17 00:00:00 2001 From: eouia Date: Mon, 4 Oct 2021 11:15:06 +0200 Subject: [PATCH 2/5] edit CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 760cb588..38ac009c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,12 @@ _This release is scheduled to be released on 2022-01-01._ ### Updated +- Update missed translation for Korean language. + ### Fixed +- Fixed wrong filename `kr.json` to `ko.json`. + ## [2.17.0] - 2021-10-01 Special thanks to the following contributors: @apiontek, @eouia, @jupadin, @khassel and @rejas. From 96611333bfbd8fe67abe6d30b75e6a67ea5cd3d6 Mon Sep 17 00:00:00 2001 From: eouia Date: Wed, 6 Oct 2021 15:42:01 +0200 Subject: [PATCH 3/5] fix translations.js --- translations/translations.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/translations/translations.js b/translations/translations.js index 85182053..e07c4ebe 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -34,7 +34,8 @@ let translations = { hu: "translations/hu.json", // Hungarian is: "translations/is.json", // Icelandic et: "translations/et.json", // Estonian - kr: "translations/kr.json", // Korean + ko: "translations/ko.json", // Korean + kr: "translations/kr.json", // Wrong File for Korean, This code is reserved for Kanurian, but for backward compatibility; it needs keeping a while; this would be eliminated or replaced with Kanuri in future. ro: "translations/ro.json", // Romanian cy: "translations/cy.json", // Welsh (Cymraeg) bg: "translations/bg.json", // Bulgarian From a2fd354dc903f29f446eb55deed790ce2c4835ac Mon Sep 17 00:00:00 2001 From: eouia Date: Wed, 6 Oct 2021 15:56:33 +0200 Subject: [PATCH 4/5] fix ko language --- CHANGELOG.md | 4 ++-- translations/kr.json | 42 ------------------------------------ translations/translations.js | 1 - 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 translations/kr.json diff --git a/CHANGELOG.md b/CHANGELOG.md index d1388bce..4466a0ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,11 +13,11 @@ _This release is scheduled to be released on 2022-01-01._ ### Updated -- Update missed translation for Korean language. +- Update missed translations for Korean language (ko.json) ### Fixed -- Fixed wrong filename `kr.json` to `ko.json`. +- Fixed wrong file `kr.json` to `ko.json`. To use language 'ko' instead of 'kr' ## [2.17.1] - 2021-10-01 diff --git a/translations/kr.json b/translations/kr.json deleted file mode 100644 index f5b88985..00000000 --- a/translations/kr.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "LOADING": "로드 중 …", - - "TODAY": "오늘", - "TOMORROW": "내일", - "DAYAFTERTOMORROW": "모레", - "RUNNING": "종료 일", - "EMPTY": "예정된 이벤트가 없습니다.", - "WEEK": "{weekNumber}주차", - - "N": "북풍", - "NNE": "북북동풍", - "NE": "북동풍", - "ENE": "동북동풍", - "E": "동풍", - "ESE": "동남동풍", - "SE": "남동풍", - "SSE": "남남동풍", - "S": "남풍", - "SSW": "남남서풍", - "SW": "남서풍", - "WSW": "서남서풍", - "W": "서풍", - "WNW": "서북서풍", - "NW": "북서풍", - "NNW": "북북서풍", - - "FEELS": "체감온도 {DEGREE}", - "PRECIP": "PoP", - - "MODULE_CONFIG_CHANGED": "모듈 {MODULE_NAME}의 설정값이 바뀌었습니다.\n매뉴얼을 참고하세요.", - "MODULE_CONFIG_ERROR": "에러 : {MODULE_NAME} - {ERROR}", - "MODULE_ERROR_MALFORMED_URL": "잘못된 URL 형식입니다.", - "MODULE_ERROR_NO_CONNECTION": "인터넷이 연결되지 않았습니다.", - "MODULE_ERROR_UNAUTHORIZED": "인증이 실패했습니다.", - "MODULE_ERROR_UNSPECIFIED": "상세 내용은 로그를 확인하세요.", - - "UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.", - "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.", - "UPDATE_INFO_SINGLE": "설치할 {COMMIT_COUNT} commit 는 {BRANCH_NAME} 분기에 해당됩니다.", - "UPDATE_INFO_MULTIPLE": "설치할 {COMMIT_COUNT} commits 는 {BRANCH_NAME} 분기에 해당됩니다." -} diff --git a/translations/translations.js b/translations/translations.js index e07c4ebe..1f2d0df5 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -35,7 +35,6 @@ let translations = { is: "translations/is.json", // Icelandic et: "translations/et.json", // Estonian ko: "translations/ko.json", // Korean - kr: "translations/kr.json", // Wrong File for Korean, This code is reserved for Kanurian, but for backward compatibility; it needs keeping a while; this would be eliminated or replaced with Kanuri in future. ro: "translations/ro.json", // Romanian cy: "translations/cy.json", // Welsh (Cymraeg) bg: "translations/bg.json", // Bulgarian From 3ae9686b2b35f14d2aae2aa628127f9447c121a4 Mon Sep 17 00:00:00 2001 From: eouia Date: Wed, 6 Oct 2021 21:32:31 +0200 Subject: [PATCH 5/5] modify CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24b35ca0..fed43cb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,11 +13,11 @@ _This release is scheduled to be released on 2022-01-01._ ### Updated +- Fixed wrong file `kr.json` to `ko.json`. Use language code 'ko' instead of 'kr' for Korean language. - Update missed translations for Korean language (ko.json) ### Fixed -- Fixed wrong file `kr.json` to `ko.json`. Use language code 'ko' instead of 'kr' for Korean language. - ESLint version supports now ECMAScript 2018 - Cleaned up `updatenotification` module and switched to nunjuck template. - Move calendar tests from category `electron` to `e2e`.