From 8d2b52a5b01ae398db226ca2b07ab481c23e80e5 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Fri, 29 Nov 2013 11:58:58 +0100
Subject: [PATCH] fixes: U4-3749 Login page is not translated

---
 .../views/common/dialogs/login.controller.js  |  8 +++++---
 .../src/views/common/dialogs/login.html       | 13 ++++++++-----
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 19 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
index 1fa9b3e767..aea8128f01 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
@@ -1,4 +1,4 @@
-angular.module("umbraco").controller("Umbraco.Dialogs.LoginController", function ($scope, userService) {
+angular.module("umbraco").controller("Umbraco.Dialogs.LoginController", function ($scope, localizationService, userService) {
     
     /**
      * @ngdoc function
@@ -10,9 +10,11 @@
      * signs the user in
      */
     var d = new Date();
-    var weekday = new Array("Super Sunday", "Manic Monday", "Tremendous Tuesday", "Wonderful Wednesday", "Thunder Thursday", "Friendly Friday", "Shiny Saturday");
+    //var weekday = new Array("Super Sunday", "Manic Monday", "Tremendous Tuesday", "Wonderful Wednesday", "Thunder Thursday", "Friendly Friday", "Shiny Saturday");
+    localizationService.localize("login_greeting"+d.getDay()).then(function(label){
+        $scope.greeting = label;
+    }); // weekday[d.getDay()];
     
-    $scope.today = weekday[d.getDay()];
     $scope.errorMsg = "";
     
     $scope.loginSubmit = function (login, password) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index 5475321a25..c5a692d63d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -2,18 +2,21 @@
     <div id="login" class="umb-modalcolumn" ng-class="{'show-validation': loginForm.$invalid}">
 
         <div class="form">
-            <h1>Happy {{today}}!</h1>
-            <p><span ng-show="dialogData.isTimedOut">Session timed out. </span>Log in below</p>
+            <h1>{{greeting}}</h1>
+            <p>
+                <span ng-show="dialogData.isTimedOut"><localize key="login_timeout">Log in below</localize>.</span>
+                <localize key="login_instruction">Log in below</localize>
+            </p>
 
             <div class="control-group" ng-class="{error: loginForm.username.$invalid}">
-                <input type="text" autofocus ng-model="login" name="username" class="input-xlarge" placeholder="Enter your username" />
+                <input type="text" autofocus ng-model="login" name="username" class="input-xlarge" localize="placeholder" placeholder="@placeholders_username" />
             </div>
 
             <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
-                <input type="password" ng-model="password" name="password" class="input-xlarge" placeholder="Enter your password" />
+                <input type="password" ng-model="password" name="password" class="input-xlarge" localize="placeholder" placeholder="@placeholders_password"  />
             </div>
 
-            <button type="submit" class="btn">Login</button>
+            <button type="submit" class="btn"><localize key="general_login">Login</localize></button>
             
             <div class="control-group" ng-show="loginForm.$invalid">
                 <div class="alert alert-error">{{errorMsg}}</div>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 7df3cb1724..953e8d75d5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -71,6 +71,7 @@
     <key alias="saveAndPublish">Gem og udgiv</key>
     <key alias="saveToPublish">Gem og send til udgivelse</key>
     <key alias="select">Vælg</key>
+    <key alias="somethingElse">Flere muligheder...</key>
     <key alias="showPage">Se siden</key>
     <key alias="styleChoose">Vælg formattering</key>
     <key alias="styleShow">Vis koder</key>
@@ -116,6 +117,9 @@
     <key alias="chooseNode">Hvor ønsker du at oprette den nye %0%</key>
     <key alias="createUnder">Opret under</key>
     <key alias="updateData">Vælg en type og skriv en titel</key>
+
+    <key alias="noDocumentTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte dokument typer. Du skal tillade disse i indstillinger under <strong>"dokument typer"</strong>.]]></key>
+    <key alias="noMediaTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte media typer. Du skal tillade disse i indstillinger under <strong>"media typer"</strong>.]]></key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Til dit website</key>
@@ -415,8 +419,21 @@
     <key alias="renewSession">Forny for at gemme dine ændringer</key>
   </area>
   <area alias="login">
+
+    <key alias="greeting0">Så er det søndag!</key>  
+    <key alias="greeting1">Smil, det er mandag!</key>
+    <key alias="greeting2">Hurra, det er tirsdag!</key>
+    <key alias="greeting3">Hvilken herlig onsdag!</key>
+    <key alias="greeting4">Glædelig torsdag!</key>
+    <key alias="greeting5">Endelig fredag!</key>
+    <key alias="greeting6">Glædelig lørdag</key>
+    
+
+    <key alias="instruction">indtast brugernavn og kodeord</key>
+    <key alias="timeout">Din session er udløbet</key>
+
+
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.org" style="text-decoration: none" target="_blank">umbraco.org</a></p> ]]></key>
-    <key alias="topText">Velkommen til umbraco, indtast dit brugernavn og kodeord:</key>
   </area>
   <area alias="main">
     <key alias="dashboard">Skrivebord</key>