diff --git a/CHANGELOG.md b/CHANGELOG.md
index d48a7faf..24123812 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## Unpublished
+### Added
+- Brazilian Portuguese Translation
+
### Fixed
- Prevent `getModules()` selectors from returning duplicate entries.
- Append endpoints of weather modules with `/` to retreive the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337))
+- Corrected grammer in `module.js` from 'suspend' to 'suspended'.
+
+### Added
+- Added ability to turn off the date display in `clock.js` when in analog mode.
+- Greek Translation
## [2.0.3] - 2016-07-12
### Added
diff --git a/js/module.js b/js/module.js
index 9ee13e4c..6f7f9686 100644
--- a/js/module.js
+++ b/js/module.js
@@ -114,7 +114,7 @@ var Module = Class.extend({
* This method is called when a module is hidden.
*/
suspend: function() {
- Log.log(this.name + " is suspend.");
+ Log.log(this.name + " is suspended.");
},
/* resume()
diff --git a/modules/default/clock/README.md b/modules/default/clock/README.md
index 77eb3fde..c7ec6bcb 100644
--- a/modules/default/clock/README.md
+++ b/modules/default/clock/README.md
@@ -101,5 +101,12 @@ The following properties can be configured:
Default value: bottom
+
+ analogShowDate |
+ Specific to the analog clock. If the clock is used as a separate module and set to analog only, this configures whether a date is also displayed with the clock.
+ Possible values: false , top , or bottom
+ Default value: top
+ |
+
diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js
index 9f4abecb..e3415375 100644
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -19,7 +19,8 @@ Module.register("clock",{
/* specific to the analog clock */
analogSize: '200px',
analogFace: 'simple', // options: 'none', 'simple', 'face-###' (where ### is 001 to 012 inclusive)
- analogPlacement: 'bottom', // options: top, bottom, left, right
+ analogPlacement: 'bottom', // options: 'top', 'bottom', 'left', 'right'
+ analogShowDate: 'top', // options: false, 'top', or 'bottom'
secondsColor: '#888888',
},
// Define required scripts.
@@ -170,8 +171,15 @@ Module.register("clock",{
// Display only an analog clock
dateWrapper.style.textAlign = "center";
dateWrapper.style.paddingBottom = "15px";
- wrapper.appendChild(dateWrapper);
- wrapper.appendChild(clockCircle);
+ if (this.config.analogShowDate === 'top') {
+ wrapper.appendChild(dateWrapper);
+ wrapper.appendChild(clockCircle);
+ } else if (this.config.analogShowDate === 'bottom') {
+ wrapper.appendChild(clockCircle);
+ wrapper.appendChild(dateWrapper);
+ } else {
+ wrapper.appendChild(clockCircle);
+ }
} else {
// Both clocks have been configured, check position
var placement = this.config.analogPlacement;
diff --git a/translations/gr.json b/translations/gr.json
new file mode 100644
index 00000000..6b9c92ac
--- /dev/null
+++ b/translations/gr.json
@@ -0,0 +1,28 @@
+{
+ /* GENERAL */
+ "LOADING": "Φόρτωση …",
+
+ /* CALENDAR */
+ "TODAY": "Σήμερα",
+ "TOMORROW": "Αύριο",
+ "RUNNING": "Λήγει σε",
+ "EMPTY": "Δεν υπάρχουν προσεχείς εκδηλώσεις.",
+
+ /* WEATHER */
+ "N": "B",
+ "NNE": "BBA",
+ "NE": "BA",
+ "ENE": "ABA",
+ "E": "A",
+ "ESE": "ANA",
+ "SE": "NA",
+ "SSE": "NNA",
+ "S": "N",
+ "SSW": "NNΔ",
+ "SW": "NΔ",
+ "WSW": "ΔNΔ",
+ "W": "Δ",
+ "WNW": "ΔΒΔ",
+ "NW": "ΒΔ",
+ "NNW": "ΒΒΔ"
+}
diff --git a/translations/pt_br.json b/translations/pt_br.json
new file mode 100644
index 00000000..57bb4314
--- /dev/null
+++ b/translations/pt_br.json
@@ -0,0 +1,28 @@
+{
+ /* GENERAL */
+ "LOADING": "Carregando …",
+
+ /* CALENDAR */
+ "TODAY": "Hoje",
+ "TOMORROW": "Amanhã",
+ "RUNNING": "Acaba em",
+ "EMPTY": "Nenhum evento novo.",
+
+ /* WEATHER */
+ "N": "N",
+ "NNE": "NNE",
+ "NE": "NE",
+ "ENE": "ENE",
+ "E": "E",
+ "ESE": "ESE",
+ "SE": "SE",
+ "SSE": "SSE",
+ "S": "S",
+ "SSW": "SSO",
+ "SW": "SO",
+ "WSW": "OSO",
+ "W": "O",
+ "WNW": "ONO",
+ "NW": "NO",
+ "NNW": "NNO"
+}
diff --git a/translations/translations.js b/translations/translations.js
index 1f541c45..2a458ef2 100644
--- a/translations/translations.js
+++ b/translations/translations.js
@@ -15,11 +15,12 @@ var translations = {
"nb" : "translations/nb.json", // Norsk bokmål
"nn" : "translations/nn.json", // Norsk nynorsk
"pt" : "translations/pt.json", // Português
+ "pt_br" : "translations/pt_br.json", // Português Brasileiro
"sv" : "translations/sv.json", // Svenska
"it" : "translations/it.json", // Italian
"zh_cn" : "translations/zh_cn.json", // Simplified Chinese
"zh_tw" : "translations/zh_tw.json", // Traditional Chinese
"ja" : "translations/ja.json", // Japanese
"pl" : "translations/pl.json", // Polish
-
+ "gr" : "translations/gr.json", // Greek
};