From c15148fc07119ed772438442fae6fa9d47b51946 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Jun 2017 14:33:18 +0200 Subject: [PATCH 1/2] Issue with date aligment in clock.js In reference to issue #927. Made changes to clock.js and clock_styles.css to prevent aligment problem when displaying analog clock and large calendar entries --- CHANGELOG.md | 1 + modules/default/clock/clock.js | 1 - modules/default/clock/clock_styles.css | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 709bd73e..fee15829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fix double message about port when server is starting - Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW. - Removed unused import from js/electron.js +- Fixed alignment of analog clock when a large calendar is displayed in the same side bar ## [2.1.1] - 2017-04-01 diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js index c25c3897..9a0f57d7 100644 --- a/modules/default/clock/clock.js +++ b/modules/default/clock/clock.js @@ -180,7 +180,6 @@ Module.register("clock",{ wrapper.appendChild(weekWrapper); } else if (this.config.displayType === "analog") { // Display only an analog clock - dateWrapper.style.textAlign = "center"; if (this.config.showWeek) { weekWrapper.style.paddingBottom = "15px"; diff --git a/modules/default/clock/clock_styles.css b/modules/default/clock/clock_styles.css index 1df9bf83..dd9eb0f8 100644 --- a/modules/default/clock/clock_styles.css +++ b/modules/default/clock/clock_styles.css @@ -1,5 +1,5 @@ .clockCircle { - margin: 0 auto; + margin: 0; position: relative; border-radius: 50%; background-size: 100%; From 8814ce05a9c1ecdeb73d2325de1f8888393c22ea Mon Sep 17 00:00:00 2001 From: Cosmin Date: Thu, 29 Jun 2017 10:00:25 +0300 Subject: [PATCH 2/2] Add translations for ro. --- CHANGELOG.md | 1 + translations/ro.json | 32 ++++++++++++++++++++++++++++++++ translations/translations.js | 1 + 3 files changed, 34 insertions(+) create mode 100644 translations/ro.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 709bd73e..a6967d60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification - Add ability to change the path of the `custom.css`. - Add translation Dutch to Alert module. +- Added Romanian translation. ### Updated - Added missing keys to Polish translation. diff --git a/translations/ro.json b/translations/ro.json new file mode 100644 index 00000000..4105763e --- /dev/null +++ b/translations/ro.json @@ -0,0 +1,32 @@ +{ + "LOADING": "Se încarcă …", + + "TODAY": "Astăzi", + "TOMORROW": "Mâine", + "DAYAFTERTOMORROW": "Poimâine", + "RUNNING": "Se termină în", + "EMPTY": "Nici un eveniment.", + + "WEEK": "Săptămâna", + + "N": "N", + "NNE": "NNE", + "NE": "NE", + "ENE": "ENE", + "E": "E", + "ESE": "ESE", + "SE": "SE", + "SSE": "SSE", + "S": "S", + "SSW": "SSW", + "SW": "SW", + "WSW": "WSW", + "W": "W", + "WNW": "WNW", + "NW": "NW", + "NNW": "NNW", + + "UPDATE_NOTIFICATION": "Un update este disponibil pentru MagicMirror².", + "UPDATE_NOTIFICATION_MODULE": "Un update este disponibil pentru modulul MODULE_NAME.", + "UPDATE_INFO": "Există COMMIT_COUNT commit-uri noi pe branch-ul BRANCH_NAME." +} diff --git a/translations/translations.js b/translations/translations.js index 61701ab9..ad40652c 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -33,6 +33,7 @@ var translations = { "is" : "translations/is.json", // Icelandic "et" : "translations/et.json", // Estonian "kr" : "translations/kr.json", // Korean + "ro" : "translations/ro.json", // Romanian }; if (typeof module !== "undefined") {module.exports = translations;}