Skip to content

Commit

Permalink
Merge pull request #225 from paviro/v2-beta
Browse files Browse the repository at this point in the history
Added translaions to the alert module
  • Loading branch information
MichMich committed Apr 23, 2016
2 parents ab14fc8 + 535a420 commit 4248ae7
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
16 changes: 14 additions & 2 deletions modules/default/alert/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,21 @@ Module.register("alert",{
//Position
position: "center",
//shown at startup
welcome_message: "Welcome, start was successful!"
welcome_message: true,
},
getScripts: function() {
return ["classie.js", "modernizr.custom.js", "notificationFx.js"];
},
getStyles: function() {
return ["ns-default.css"];
},
// Define required translations.
getTranslations: function() {
return {
en: "translations/en.json",
de: "translations/de.json"
};
},
show_notification: function(message) {
if (this.config.effect == "slide") {this.config.effect = this.config.effect + "-" + this.config.position;}
message = "<span class='thin' style='line-height: 35px; font-size:24px' color='#4A4A4A'>" + message.title + "</span><br /><span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>";
Expand Down Expand Up @@ -111,7 +118,12 @@ Module.register("alert",{
this.alerts = {};
this.setPosition(this.config.position);
if (this.config.welcome_message) {
this.show_notification({title: "MagicMirror Notification", message: this.config.welcome_message});
if (this.config.welcome_message == true){
this.show_notification({title: this.translate("sysTitle"), message: this.translate("welcome")});
}
else{
this.show_notification({title: this.translate("sysTitle"), message: this.config.welcome_message});
}
}
Log.info("Starting module: " + this.name);
}
Expand Down
4 changes: 4 additions & 0 deletions modules/default/alert/translations/de.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"sysTitle": "MagicMirror Benachrichtigung",
"welcome": "Willkommen, Start war erfolgreich!"
}
4 changes: 4 additions & 0 deletions modules/default/alert/translations/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"sysTitle": "MagicMirror Notification",
"welcome": "Welcome, start was successful!"
}

0 comments on commit 4248ae7

Please sign in to comment.