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 @@
-

Happy {{today}}!

-

Session timed out. Log in below

+

{{greeting}}

+

+ Log in below. + Log in below +

- +
- +
- +
{{errorMsg}}
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 @@ Gem og udgiv Gem og send til udgivelse Vælg + Flere muligheder... Se siden Vælg formattering Vis koder @@ -116,6 +117,9 @@ Hvor ønsker du at oprette den nye %0% Opret under Vælg en type og skriv en titel + + "dokument typer".]]> + "media typer".]]> Til dit website @@ -415,8 +419,21 @@ Forny for at gemme dine ændringer + + Så er det søndag! + Smil, det er mandag! + Hurra, det er tirsdag! + Hvilken herlig onsdag! + Glædelig torsdag! + Endelig fredag! + Glædelig lørdag + + + indtast brugernavn og kodeord + Din session er udløbet + + © 2001 - %0%
umbraco.org

]]>
- Velkommen til umbraco, indtast dit brugernavn og kodeord: Skrivebord