Merge pull request #6 from marcus-no/master

Added UTF-8 char set and Norwegian translation
MagicMirrorOrg · May 20, 2014 · d33d681 · d33d681
2 parents febdfd7 + f461541
commit d33d681
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/index.php b/index.php
@@ -9,6 +9,7 @@
 		var gitHash = '<?php echo trim(`git rev-parse HEAD`) ?>';
 	</script>
 	<meta name="google" value="notranslate" />
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 </head>
 <body>
 
@@ -28,4 +29,4 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.16/socket.io.min.js"></script>
 
 </body>
-</html>
+</html>
diff --git a/js/main.js b/js/main.js
@@ -74,6 +74,13 @@ jQuery(document).ready(function($) {
             var tomorrow = 'demain';
             var in_days = 'jour(s)';
             break;            
+	case 'no':
+	    var days = ['søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'];
+            var months = ['januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'];
+            var dayAbbr = ['søn','man','tirs','ons','tors','fre','lør'];
+            var today = 'i dag';
+            var tomorrow = 'i morgen';
+            var in_days = 'dager';
         default:
             var days = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
             var months = ['January','February','March','April','May','June','July','August','September','October','November','December'];