From 5eea4d039f0cd158ee957ca2f297ffa5d3bc645f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 11 Mar 2016 15:32:05 +0100
Subject: [PATCH] remore ui replacements

---
 .../umbraco/dialogs/ChangeDocType.aspx        |  4 +--
 .../umbraco/dialogs/ChangeDocType.aspx.cs     | 27 ++++++++++---------
 .../umbraco/dialogs/RegexWs.aspx              |  2 +-
 .../umbraco/dialogs/create.aspx               |  6 ++---
 src/Umbraco.Web.UI/umbraco/dialogs/cruds.aspx |  2 +-
 .../dialogs/insertMasterpageContent.aspx      |  2 +-
 .../dialogs/insertMasterpagePlaceholder.aspx  |  2 +-
 .../umbraco/dialogs/notifications.aspx        |  2 +-
 .../umbraco/dialogs/republish.aspx            |  4 +--
 .../umbraco/dialogs/rollBack.aspx             |  2 +-
 src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx  | 12 ++++-----
 .../umbraco/settings/editTemplate.aspx        |  8 +++---
 .../umbraco/translation/default.aspx          |  4 +--
 .../umbraco/users/NodePermissions.ascx        |  4 +--
 .../umbraco/controls/ProgressBar.ascx         |  2 +-
 .../developer/Packages/installedPackage.aspx  |  6 ++---
 .../umbraco/dialogs/AssignDomain2.aspx        | 20 +++++++-------
 .../umbraco/dialogs/RegexWs.aspx              |  2 +-
 .../dialogs/insertMasterpageContent.aspx      |  4 +--
 .../dialogs/insertMasterpagePlaceholder.aspx  |  2 +-
 .../umbraco/dialogs/notifications.aspx        |  2 +-
 .../umbraco/dialogs/republish.aspx            |  4 +--
 .../umbraco/dialogs/rollBack.aspx             |  2 +-
 .../umbraco/settings/scripts/editScript.aspx  |  6 ++---
 .../umbraco/translation/default.aspx          |  4 +--
 .../umbraco/users/NodePermissions.ascx        |  4 +--
 src/umbraco.controls/ProgressBar.cs           |  9 +++----
 27 files changed, 73 insertions(+), 75 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
index 9da1930263..a5ebd8be30 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
@@ -91,13 +91,13 @@
     </cc1:Pane>
 
     <asp:PlaceHolder ID="SuccessPlaceholder" runat="server" Visible="false">
-        <p><%=umbraco.ui.Text("changeDocType", "docTypeChanged") %></p>
+        <p><%=Services.TextService.Localize("changeDocType/docTypeChanged") %></p>
         <p>        
             <asp:Literal ID="SuccessMessage" runat="server" />
             <asp:Literal ID="PropertiesMappedMessage" runat="server" />
             <asp:Literal ID="ContentPublishedMessage" runat="server" />
             <br /><br />
-            <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("defaultdialogs", "closeThisWindow") %></a>  
+            <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("defaultdialogs/closeThisWindow") %></a>  
         </p>
     </asp:PlaceHolder>
 
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
index 0db3b6c36e..4bb8b92b13 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using Umbraco.Core;
+using Umbraco.Core.Services;
 using Umbraco.Core.Models;
 using Umbraco.Web.UI.Pages;
 
@@ -47,13 +48,13 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
 
         private void LocalizeTexts()
         {
-            ChangeDocTypePane.Text = global::umbraco.ui.Text("changeDocType", "selectNewDocType");
-            ContentNamePropertyPanel.Text = global::umbraco.ui.Text("changeDocType", "selectedContent");
-            CurrentTypePropertyPanel.Text = global::umbraco.ui.Text("changeDocType", "currentType");
-            NewTypePropertyPanel.Text = global::umbraco.ui.Text("changeDocType", "newType");
-            NewTemplatePropertyPanel.Text = global::umbraco.ui.Text("changeDocType", "newTemplate");
-            ChangeDocTypePropertyMappingPane.Text = global::umbraco.ui.Text("changeDocType", "mapProperties");
-            ValidateAndSave.Text = global::umbraco.ui.Text("buttons", "save");
+            ChangeDocTypePane.Text = Services.TextService.Localize("changeDocType/selectNewDocType");
+            ContentNamePropertyPanel.Text = Services.TextService.Localize("changeDocType/selectedContent");
+            CurrentTypePropertyPanel.Text = Services.TextService.Localize("changeDocType/currentType");
+            NewTypePropertyPanel.Text = Services.TextService.Localize("changeDocType/newType");
+            NewTemplatePropertyPanel.Text = Services.TextService.Localize("changeDocType/newTemplate");
+            ChangeDocTypePropertyMappingPane.Text = Services.TextService.Localize("changeDocType/mapProperties");
+            ValidateAndSave.Text = Services.TextService.Localize("buttons/save");
         }
 
         private void DisplayContentDetails()
@@ -132,7 +133,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
             NewTemplateList.DataValueField = "Id";
             NewTemplateList.DataTextField = "Name";
             NewTemplateList.DataBind();
-            NewTemplateList.Items.Add(new ListItem("<" + global::umbraco.ui.Text("changeDocType", "none") + ">", "0"));
+            NewTemplateList.Items.Add(new ListItem("<" + Services.TextService.Localize("changeDocType/none") + ">", "0"));
 
             // Set default template
             if (contentType.DefaultTemplate != null)
@@ -173,7 +174,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
                     ddl.DataValueField = "Alias";
                     ddl.DataTextField = "Name";
                     ddl.DataBind();
-                    ddl.Items.Insert(0, new ListItem("<" + global::umbraco.ui.Text("changeDocType", "none") + ">", string.Empty));
+                    ddl.Items.Insert(0, new ListItem("<" + Services.TextService.Localize("changeDocType/none") + ">", string.Empty));
 
                     // Set default selection to be one with matching alias
                     var alias = ((HiddenField)ri.FindControl("Alias")).Value;
@@ -237,7 +238,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
                 foreach (var propertyMapping in propertyMappings)
                 {
                     propertiesMappedMessageBuilder.AppendFormat("<li>{0} {1} {2}</li>",
-                        propertyMapping.FromName, global::umbraco.ui.Text("changeDocType", "to"), propertyMapping.ToName);
+                        propertyMapping.FromName, Services.TextService.Localize("changeDocType/to"), propertyMapping.ToName);
                     _content.SetValue(propertyMapping.ToAlias, propertyMapping.Value);
                 }
                 propertiesMappedMessageBuilder.Append("</ul>");
@@ -259,11 +260,11 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
                 ClientTools.ReloadLocation();
 
                 // Display success message
-                SuccessMessage.Text = global::umbraco.ui.Text("changeDocType", "successMessage").Replace("[new type]", "<strong>" + newContentType.Name + "</strong>");
+                SuccessMessage.Text = Services.TextService.Localize("changeDocType/successMessage").Replace("[new type]", "<strong>" + newContentType.Name + "</strong>");
                 PropertiesMappedMessage.Text = propertiesMappedMessageBuilder.ToString();
                 if (wasPublished)
                 {
-                    ContentPublishedMessage.Text = global::umbraco.ui.Text("changeDocType", "contentRepublished");
+                    ContentPublishedMessage.Text = Services.TextService.Localize("changeDocType/contentRepublished");
                     ContentPublishedMessage.Visible = true;
                 }
                 else
@@ -296,7 +297,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
                     {
                         if (mappedPropertyAliases.Contains(mappedPropertyAlias))
                         {
-                            ValidationError.Text = global::umbraco.ui.Text("changeDocType", "validationErrorPropertyWithMoreThanOneMapping");
+                            ValidationError.Text = Services.TextService.Localize("changeDocType/validationErrorPropertyWithMoreThanOneMapping");
                             return false;
                         }
 
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
index c2cbe45978..a984a97baa 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
@@ -10,7 +10,7 @@
 	  <cc1:PropertyPanel ID="pp_search" Text="Search" runat="server">
 		  <asp:TextBox ID="searchField" style="width: 250px;" runat="server" /> <asp:Button ID="bt_search" runat="server" Text="search" OnClick="findRegex" />
 				<p>
-				<small><%= umbraco.ui.Text("defaultdialogs", "regexSearchHelp")%> </small>
+				<small><%= Services.TextService.Localize("defaultdialogs/regexSearchHelp")%> </small>
 				</p>
 	  </cc1:PropertyPanel>
 	  
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
index 686c781386..a60a23a9a3 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
@@ -24,12 +24,12 @@
 			    umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
 				}
 			else			
-				pageName.html("<p><strong><%=umbraco.ui.Text(App)%></strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
+				pageName.html("<p><strong><%=umbraco.ui.Text(App)%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %></p>");
 				pageNameHolder.attr("class","success");
 		}
 		
 		function updateName(result) {			  
-		    pageName.html("<p><strong>" + result + "</strong> <%= umbraco.ui.Text("moveOrCopy","nodeSelected") %></p>");
+		    pageName.html("<p><strong>" + result + "</strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %></p>");
 			pageNameHolder.attr("class","success");
 		}
 		
@@ -50,7 +50,7 @@
     </cc1:Pane>
     <asp:Panel runat="server" ID="panel_buttons">
         <cc1:Feedback runat="server" ID="PageNameHolder" type="notice" Style="margin-top: 10px;"
-            Text='<%#umbraco.ui.Text("moveOrCopy","noNodeSelected")%>' />
+            Text='<%#Services.TextService.Localize("moveOrCopy/noNodeSelected")%>' />
         <div style="padding-top: 10px;" class="guiDialogNormal">
             <input type="button" id="ok" value="<%=umbraco.ui.Text("ok")%>" onclick="onNodeSelectionConfirmed();"
                 disabled="true" style="width: 100px" />
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/cruds.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/cruds.aspx
index fd7621f677..72b4f1c9f1 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/cruds.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/cruds.aspx
@@ -19,7 +19,7 @@
 </div>
 
 <div runat="server" ID="panel_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>  
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>  
        <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
 </div>
  </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
index 802e5e8365..988b0e179e 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
@@ -17,7 +17,7 @@
   <cc1:Pane ID="pane_insert" runat="server">
     <cc1:PropertyPanel runat="server">
             <p>
-                <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%>
+                <%= Services.TextService.Localize("defaultdialogs/templateContentPlaceHolderHelp")%>
             </p>
     </cc1:PropertyPanel>
     <cc1:PropertyPanel runat="server" id="pp_placeholder" text="Placeholder ID">
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
index 6bd968493f..bfa223b4b0 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
@@ -21,7 +21,7 @@
   <cc1:Pane ID="pane_insert" runat="server">
     <cc1:PropertyPanel runat="server">
             <p>
-                <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%>
+                <%= Services.TextService.Localize("defaultdialogs/templateContentAreaHelp")%>
             </p>
     </cc1:PropertyPanel>
     <cc1:PropertyPanel runat="server" id="pp_placeholder" text="Placeholder ID">
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx
index cd97ec267f..ecb6b2ed62 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx
@@ -12,7 +12,7 @@
     </cc1:Pane>
 </div>
 <div runat="server" ID="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>  
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>  
        <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
 </div>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
index 57fa636f1b..3261f3edd1 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/republish.aspx
@@ -15,7 +15,7 @@
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <asp:Panel ID="p_republish" runat="server">
     <div class="propertyDiv">      
-          <p><%= umbraco.ui.Text("defaultdialogs", "siterepublishHelp")%> </p>
+          <p><%= Services.TextService.Localize("defaultdialogs/siterepublishHelp")%> </p>
     </div>
       
     <div id="buttons" class="btn-toolbar umb-btn-toolbar">
@@ -33,7 +33,7 @@
     
     <asp:Panel ID="p_done" Visible="false" runat="server">
      <div class="success">
-      <p><%= umbraco.ui.Text("defaultdialogs", "siterepublished")%></p>
+      <p><%= Services.TextService.Localize("defaultdialogs/siterepublished")%></p>
       
      </div>
       <input type="button" class="btn btn-primary" onclick="UmbClientMgr.closeModalWindow();" value="Ok" />
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
index 94af7300e0..fbea7b2ad6 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
@@ -92,7 +92,7 @@
     </div>
 
     <div runat="server" id="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
         <asp:Button ID="Button1" runat="server" visible="false" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
     </div>  
 </asp:Content>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
index 9fe8dd8736..5a7addb1f5 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
@@ -21,7 +21,7 @@
 
           <div id="loading" style="display: none; margin-bottom: 35px;">
                 <div class="notice">
-                    <p><%= umbraco.ui.Text("sort", "sortPleaseWait") %></p>
+                    <p><%= Services.TextService.Localize("sort/sortPleaseWait") %></p>
                 </div>
                 
                 <div class="umb-loader-wrapper">
@@ -34,22 +34,22 @@
                     <asp:Literal runat="server" ID="sortDone"></asp:Literal>
                 </p>
                 <p>
-                    <a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= umbraco.ui.Text("defaultdialogs", "closeThisWindow")%></a>
+                    <a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= Services.TextService.Localize("defaultdialogs/closeThisWindow")%></a>
                 </p>
             </div>
 
             <div id="sortArea">
                 <p class="help">
-                    <%= umbraco.ui.Text("sort", "sortHelp") %>
+                    <%= Services.TextService.Localize("sort/sortHelp") %>
                 </p>
 
                 <div id="sortableFrame">
                     <table id="sortableNodes">
                         <thead>
                             <tr>
-                                <th style="width: 100%"><%= umbraco.ui.Text("general", "name") %></th>
-                                <th class="nowrap" style="display: <%= HideDateColumn ? "none" : "table-cell" %>;"><%= umbraco.ui.Text("sort", "sortCreationDate") %></th>
-                                <th class="nowrap"><%= umbraco.ui.Text("sort", "sortOrder") %></th>
+                                <th style="width: 100%"><%= Services.TextService.Localize("general/name") %></th>
+                                <th class="nowrap" style="display: <%= HideDateColumn ? "none" : "table-cell" %>;"><%= Services.TextService.Localize("sort/sortCreationDate") %></th>
+                                <th class="nowrap"><%= Services.TextService.Localize("sort/sortOrder") %></th>
                             </tr>
                         </thead>
                         <tbody>
diff --git a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
index 9cd2379610..d1002bf8eb 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
@@ -35,10 +35,10 @@
                 masterPageDropDown: $("#<%= MasterTemplate.ClientID %>"),
                 treeSyncPath: '<%=TemplateTreeSyncPath%>',
                 text: {
-                    templateErrorHeader: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateErrorHeader")) %>",
-                    templateSavedHeader: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateSavedHeader")) %>",
-                    templateErrorText: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateErrorText")) %>",
-                    templateSavedText: "<%= HttpUtility.JavaScriptStringEncode(umbraco.ui.Text("speechBubbles", "templateSavedText")) %>"
+                    templateErrorHeader: "<%= HttpUtility.JavaScriptStringEncode(Services.TextService.Localize("speechBubbles/templateErrorHeader")) %>",
+                    templateSavedHeader: "<%= HttpUtility.JavaScriptStringEncode(Services.TextService.Localize("speechBubbles/templateSavedHeader")) %>",
+                    templateErrorText: "<%= HttpUtility.JavaScriptStringEncode(Services.TextService.Localize("speechBubbles/templateErrorText")) %>",
+                    templateSavedText: "<%= HttpUtility.JavaScriptStringEncode(Services.TextService.Localize("speechBubbles/templateSavedText")) %>"
                 }
             });
 
diff --git a/src/Umbraco.Web.UI/umbraco/translation/default.aspx b/src/Umbraco.Web.UI/umbraco/translation/default.aspx
index 5884054a2f..6a4be5cf5b 100644
--- a/src/Umbraco.Web.UI/umbraco/translation/default.aspx
+++ b/src/Umbraco.Web.UI/umbraco/translation/default.aspx
@@ -31,9 +31,9 @@
        </p>
         
         <p>
-            <a href="xml.aspx?task=all" target="_blank"><%= umbraco.ui.Text("translation", "downloadAllAsXml") %></a>
+            <a href="xml.aspx?task=all" target="_blank"><%= Services.TextService.Localize("translation/downloadAllAsXml") %></a>
              &nbsp; &nbsp;
-            <a href="translationTasks.dtd" target="_blank"><%= umbraco.ui.Text("translation", "DownloadXmlDTD")%></a>        
+            <a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>        
         </p>              
       <asp:GridView GridLines="Horizontal" ID="taskList" runat="server" CssClass="fieldsTable" BorderStyle="None" Width="100%"
             CellPadding="5" AutoGenerateColumns="false">
diff --git a/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx b/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx
index 64b6717579..fecd4fcec7 100644
--- a/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx
+++ b/src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="NodePermissions.ascx.cs" Inherits="umbraco.cms.presentation.user.NodePermissions" %>
 <p class="umb-abstract">
-    <%=umbraco.ui.Text("user", "permissionSelectedPages")%>
+    <%=Services.TextService.Localize("user/permissionSelectedPages")%>
 	<br/>
 	<asp:Literal runat="server" ID="lt_names" />
 </p>
@@ -10,7 +10,7 @@
 		<input type="checkbox" name="chkChildPermissions" id="chkChildPermissions" />
 		<strong>
 			<label for="chkChildPermissions" class="checkbox inline">
-				<%= umbraco.ui.Text("user", "permissionReplaceChildren")%>
+				<%= Services.TextService.Localize("user/permissionReplaceChildren")%>
 			</label>
 		</strong>
 	</p>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx
index 1ef0e8f946..7b4a239210 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx
@@ -1,2 +1,2 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
-<img src='<%#Umbraco.Core.IO.SystemDirectories.UmbracoClient%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress")%>' /><br />
+<img src='<%#Umbraco.Core.IO.SystemDirectories.UmbracoClient%>/images/progressBar.gif' id="ImgBar" alt='<%#Services.TextService.Localize("publish/inProgress")%>' /><br />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx
index 6f9ad54b0d..c3c46f3611 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx
@@ -74,7 +74,7 @@
     
             <cc2:PropertyPanel runat="server">
               <p>
-                  <%= umbraco.ui.Text("packager", "packageUpgradeText") %>
+                  <%= Services.TextService.Localize("packager/packageUpgradeText") %>
               </p>
             </cc2:PropertyPanel>
     
@@ -92,7 +92,7 @@
             <cc2:Pane ID="pane_noItems" Visible="false" runat="server" Text="Uninstaller doesn't contain any items">
                 <div class="guiDialogNormal" style="margin: 10px">
 
-                    <%= umbraco.ui.Text("packager", "packageNoItemsText") %>
+                    <%= Services.TextService.Localize("packager/packageNoItemsText") %>
 
                     <p>
                         <asp:Button ID="bt_deletePackage" OnClick="delPack" runat="server" Text="Remove uninstaller" />
@@ -104,7 +104,7 @@
             
             <cc2:Pane ID="pane_uninstall" runat="server" Text="Uninstall items installed by this package">
                 <p>
-                    <%= umbraco.ui.Text("packager", "packageUninstallText") %>
+                    <%= Services.TextService.Localize("packager/packageUninstallText") %>
                 </p>
 
                 <cc2:PropertyPanel runat="server" Text="Document Types" ID="pp_docTypes">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
index 88af0c2007..3b0f3e0cf0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/AssignDomain2.aspx
@@ -15,8 +15,8 @@
             var dialog = new Umbraco.Dialogs.AssignDomain2({
                 nodeId: <%=GetNodeId()%>,
                 restServiceLocation: '<%=GetRestServicePath() %>',
-                invalidDomain: '<%=umbraco.ui.Text("assignDomain", "invalidDomain") %>',
-                duplicateDomain: '<%=umbraco.ui.Text("assignDomain", "duplicateDomain") %>',
+                invalidDomain: '<%=Services.TextService.Localize("assignDomain/invalidDomain") %>',
+                duplicateDomain: '<%=Services.TextService.Localize("assignDomain/duplicateDomain") %>',
                 <asp:Literal runat="server" ID="data" />
             });
         dialog.init();
@@ -34,8 +34,8 @@
 
         <cc1:Pane runat="server" ID="pane_language">
             <cc1:PropertyPanel runat="server" ID="prop_language">
-                <select class="umb-editor umb-dropdown" name="language" data-bind="options: languages, optionsText: 'Code', optionsValue: 'Id', value: language, optionsCaption: '<%=umbraco.ui.Text("assignDomain", "inherit") %>    '"></select>
-                <!--    <small class="help-inline"><%=umbraco.ui.Text("assignDomain", "setLanguageHelp") %></small>-->
+                <select class="umb-editor umb-dropdown" name="language" data-bind="options: languages, optionsText: 'Code', optionsValue: 'Id', value: language, optionsCaption: '<%=Services.TextService.Localize("assignDomain/inherit") %>    '"></select>
+                <!--    <small class="help-inline"><%=Services.TextService.Localize("assignDomain/setLanguageHelp") %></small>-->
             </cc1:PropertyPanel>
         </cc1:Pane>
 
@@ -45,8 +45,8 @@
                 <table class="table domains" data-bind="visible: domains().length > 0">
                     <thead>
                         <tr>
-                            <th><%=umbraco.ui.Text("assignDomain", "domain") %></th>
-                            <th><%=umbraco.ui.Text("assignDomain", "language") %></th>
+                            <th><%=Services.TextService.Localize("assignDomain/domain") %></th>
+                            <th><%=Services.TextService.Localize("assignDomain/language") %></th>
                             <th />
                         </tr>
                     </thead>
@@ -63,8 +63,8 @@
             </cc1:PropertyPanel>
 
             <cc1:PropertyPanel runat="server">
-                <small data-bind="visible: domains().length == 0" class="help-inline"><%=umbraco.ui.Text("assignDomain", "domainHelp") %></small>
-                <button class="btn" data-bind="click: addDomain"><%=umbraco.ui.Text("assignDomain", "addNew") %></button>
+                <small data-bind="visible: domains().length == 0" class="help-inline"><%=Services.TextService.Localize("assignDomain/domainHelp") %></small>
+                <button class="btn" data-bind="click: addDomain"><%=Services.TextService.Localize("assignDomain/addNew") %></button>
             </cc1:PropertyPanel>
 
 
@@ -75,8 +75,8 @@
 
 
     <div runat="server" id="p_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>
-        <button class="btn btn-primary" id="btnSave"><%=umbraco.ui.Text("buttons", "save") %></button>
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
+        <button class="btn btn-primary" id="btnSave"><%=Services.TextService.Localize("buttons/save") %></button>
     </div>
 
 </asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx
index 6dd0954156..8c5fcfcd87 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/RegexWs.aspx
@@ -9,7 +9,7 @@
 	  <cc1:PropertyPanel ID="pp_search" Text="Search" runat="server">
 		  <asp:TextBox ID="searchField" style="width: 250px;" runat="server" /> <asp:Button ID="bt_search" runat="server" Text="search" OnClick="findRegex" />
 				<p>
-				<small><%= umbraco.ui.Text("defaultdialogs", "regexSearchHelp")%> </small>
+				<small><%= Services.TextService.Localize("defaultdialogs/regexSearchHelp")%> </small>
 				</p>
 	  </cc1:PropertyPanel>
 	  
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
index 4d03583621..95f1c9ce10 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpageContent.aspx
@@ -17,7 +17,7 @@
   <cc1:Pane ID="pane_insert" runat="server">
     <cc1:PropertyPanel runat="server">
             <p>
-                <%= umbraco.ui.Text("defaultdialogs", "templateContentPlaceHolderHelp")%>
+                <%= Services.TextService.Localize("defaultdialogs/templateContentPlaceHolderHelp")%>
             </p>
     </cc1:PropertyPanel>
     <cc1:PropertyPanel runat="server" id="pp_placeholder" text="Placeholder ID">
@@ -26,7 +26,7 @@
   </cc1:Pane>
    
   <cc1:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
-            <a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=umbraco.ui.Text("general", "cancel")%></a>
+            <a class="btn btn-link" onclick="UmbClientMgr.closeModalWindow(); return false;"><%=Services.TextService.Localize("general/cancel")%></a>
             <input type="button" onclick="insertCode(); return false;" Class="btn btn-primary" value="<%= umbraco.ui.Text("insert") %>" />
   </cc1:Pane>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx
index e3c114be2d..556a1cb2d1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMasterpagePlaceholder.aspx
@@ -18,7 +18,7 @@
   <cc1:Pane ID="pane_insert" runat="server">
     <cc1:PropertyPanel runat="server">
             <p>
-                <%= umbraco.ui.Text("defaultdialogs", "templateContentAreaHelp")%>
+                <%= Services.TextService.Localize("defaultdialogs/templateContentAreaHelp")%>
             </p>
     </cc1:PropertyPanel>
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
index cd97ec267f..ecb6b2ed62 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
@@ -12,7 +12,7 @@
     </cc1:Pane>
 </div>
 <div runat="server" ID="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>  
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>  
        <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="Button1_Click"></asp:Button>
 </div>
 </asp:Content>
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
index 6bf030b86d..ded65f1bd9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/republish.aspx
@@ -15,7 +15,7 @@
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <asp:Panel ID="p_republish" runat="server">
       <div class="propertyDiv">      
-          <p><%= umbraco.ui.Text("defaultdialogs", "siterepublishHelp")%> </p>
+          <p><%= Services.TextService.Localize("defaultdialogs/siterepublishHelp")%> </p>
       </div>
       
           <div id="buttons">
@@ -32,7 +32,7 @@
     
     <asp:Panel ID="p_done" Visible="false" runat="server">
      <div class="success">
-      <p><%= umbraco.ui.Text("defaultdialogs", "siterepublished")%></p>
+      <p><%= Services.TextService.Localize("defaultdialogs/siterepublished")%></p>
       
      </div>
       <input type="button" class="guiInputButton" onclick="UmbClientMgr.closeModalWindow();" value="Ok" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
index 6b67e41ecb..d9c68ba21e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
@@ -93,7 +93,7 @@
     </div>
 
     <div runat="server" id="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=Services.TextService.Localize("general/cancel")%></a>
         <asp:Button ID="Button1" runat="server" Visible="false" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
     </div>  
 </asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx
index 089f28ea47..628e1a645a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx
@@ -22,14 +22,14 @@
 
         function submitSucces(t) {
             if (t != 'true') {
-                top.UmbSpeechBubble.ShowMessage('error', '<%= umbraco.ui.Text("speechBubbles", "fileErrorHeader") %>', '<%= umbraco.ui.Text("speechBubbles", "fileErrorText") %>');
+                top.UmbSpeechBubble.ShowMessage('error', '<%= Services.TextService.Localize("speechBubbles/fileErrorHeader") %>', '<%= Services.TextService.Localize("speechBubbles/fileErrorText") %>');
             }
             else {
-                top.UmbSpeechBubble.ShowMessage('save', '<%= umbraco.ui.Text("speechBubbles", "fileSavedHeader") %>', '')
+                top.UmbSpeechBubble.ShowMessage('save', '<%= Services.TextService.Localize("speechBubbles/fileSavedHeader") %>', '')
             }
         }
         function submitFailure(t) {
-            top.UmbSpeechBubble.ShowMessage('error', '<%= umbraco.ui.Text("speechBubbles", "fileErrorHeader") %>', '<%= umbraco.ui.Text("speechBubbles", "fileErrorText") %>')
+            top.UmbSpeechBubble.ShowMessage('error', '<%= Services.TextService.Localize("speechBubbles/fileErrorHeader") %>', '<%= Services.TextService.Localize("speechBubbles/fileErrorText") %>')
         }    
     </script>
 </asp:Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx
index 06a5c2c9e6..872e0481fa 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx
@@ -31,9 +31,9 @@
        </p>
         
         <p>
-            <a href="xml.aspx?task=all" target="_blank"><%= umbraco.ui.Text("translation", "downloadAllAsXml") %></a>
+            <a href="xml.aspx?task=all" target="_blank"><%= Services.TextService.Localize("translation/downloadAllAsXml") %></a>
              &nbsp; &nbsp;
-            <a href="translationTasks.dtd" target="_blank"><%= umbraco.ui.Text("translation", "DownloadXmlDTD")%></a>        
+            <a href="translationTasks.dtd" target="_blank"><%= Services.TextService.Localize("translation/DownloadXmlDTD")%></a>        
         </p>              
       <asp:GridView GridLines="Horizontal" ID="taskList" runat="server" CssClass="fieldsTable" BorderStyle="None" Width="100%"
             CellPadding="5" AutoGenerateColumns="false">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx
index 64b6717579..fecd4fcec7 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="NodePermissions.ascx.cs" Inherits="umbraco.cms.presentation.user.NodePermissions" %>
 <p class="umb-abstract">
-    <%=umbraco.ui.Text("user", "permissionSelectedPages")%>
+    <%=Services.TextService.Localize("user/permissionSelectedPages")%>
 	<br/>
 	<asp:Literal runat="server" ID="lt_names" />
 </p>
@@ -10,7 +10,7 @@
 		<input type="checkbox" name="chkChildPermissions" id="chkChildPermissions" />
 		<strong>
 			<label for="chkChildPermissions" class="checkbox inline">
-				<%= umbraco.ui.Text("user", "permissionReplaceChildren")%>
+				<%= Services.TextService.Localize("user/permissionReplaceChildren")%>
 			</label>
 		</strong>
 	</p>
diff --git a/src/umbraco.controls/ProgressBar.cs b/src/umbraco.controls/ProgressBar.cs
index b7fdabcd7a..8d1e6591ce 100644
--- a/src/umbraco.controls/ProgressBar.cs
+++ b/src/umbraco.controls/ProgressBar.cs
@@ -1,16 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.UI.WebControls;
-using Umbraco.Core.IO;
+using Umbraco.Core;
+using Umbraco.Core.Services;
 
 namespace umbraco.uicontrols
 {
     [Obsolete("Use Umbraco.Web.UI.Controls.ProgressBar")]
     public class ProgressBar : System.Web.UI.WebControls.Panel
     {
-        private string _title = umbraco.ui.Text("publish", "inProgress");
+        private string _title = ApplicationContext.Current.Services.TextService.Localize("publish/inProgress");
         public string Title { get; set; }
 
         protected override void Render(System.Web.UI.HtmlTextWriter writer)