yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remore ui replacements

Browse Source
This commit is contained in:
Shannon
2016-03-15 16:39:17 +01:00
parent bf36b54ac8
commit fb5e998e1f
21 changed files with 45 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -860,7 +860,6 @@
<Content Include="Umbraco\Dialogs\exportDocumenttype.aspx" />
<Content Include="Umbraco\Dialogs\importDocumenttype.aspx" />
<Content Include="Umbraco\Dialogs\insertMacro.aspx" />
<Content Include="Umbraco\Dialogs\insertTable.aspx" />
<Content Include="Umbraco\Dialogs\moveOrCopy.aspx" />
<Content Include="Umbraco\Dialogs\notifications.aspx" />
<Content Include="Umbraco\Developer\Packages\installer.aspx" />

8
src/Umbraco.Web.UI/umbraco/create/User.ascx
View File

@@ -4,10 +4,10 @@
<p>
Login Name:
<asp:RequiredFieldValidator ID="loginRequired"
ErrorMessage='<%#ui.Text("errorHandling", "errorMandatoryWithoutTab", "Login Name", CurrentUser) %>'
ErrorMessage='<%#Services.TextService.Localize("errorHandling/errorMandatoryWithoutTab", new[] { "Login Name"}) %>'
ControlToValidate="Login" runat="server">*</asp:RequiredFieldValidator>
<asp:CustomValidator ID="loginExistsCheck" runat="server"
ErrorMessage='<%#ui.Text("errorHandling", "errorExistsWithoutTab", "Login Name", CurrentUser) %>'
ErrorMessage='<%#Services.TextService.Localize("errorHandling/errorExistsWithoutTab", new[] { "Login Name"}) %>'
ControlToValidate="Login" ValidateEmptyText="false" OnServerValidate="LoginExistsCheck"></asp:CustomValidator>
<br />
<asp:TextBox ID="Login" runat="server" Width="350px" CssClass="bigInput"></asp:TextBox>
@@ -15,10 +15,10 @@
<p>
E-mail:
<asp:RequiredFieldValidator ID="emailRequired"
ErrorMessage='<%#ui.Text("errorHandling", "errorMandatoryWithoutTab", "E-mail", CurrentUser) %>'
ErrorMessage='<%#Services.TextService.Localize("errorHandling/errorMandatoryWithoutTab", new[] { "E-mail"}) %>'
ControlToValidate="Email" runat="server">*</asp:RequiredFieldValidator>
<asp:CustomValidator ID="emailExistsCheck" runat="server"
ErrorMessage='<%#ui.Text("errorHandling", "errorExistsWithoutTab", "E-mail", CurrentUser) %>'
ErrorMessage='<%#Services.TextService.Localize("errorHandling/errorExistsWithoutTab", new[] { "E-mail"}) %>'
ControlToValidate="Email" ValidateEmptyText="false" OnServerValidate="EmailExistsCheck"></asp:CustomValidator>
<asp:CustomValidator runat="server" ID="EmailValidator" OnServerValidate="EmailValidator_OnServerValidate"
ControlToValidate="Email"

2
src/Umbraco.Web.UI/umbraco/dialogs/create.aspx
View File

@@ -24,7 +24,7 @@
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
}
else
pageName.html("<p><strong><%=umbraco.ui.Text(App)%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %></p>");
pageName.html("<p><strong><%=Services.TextService.Localize(App)%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %></p>");
pageNameHolder.attr("class","success");
}

6
src/Umbraco.Web.UI/umbraco/dialogs/editMacro.aspx
View File

@@ -39,8 +39,8 @@
<cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<input data-bind="click: updateMacro" class="btn btn-primary" type="button" value="<%=umbraco.ui.Text("general", "ok", this.getUser())%>" />
<a class="btn btn-link" data-bind="click: cancelModal" ><%=Services.TextService.Localize("general/cancel")%></a>
<input data-bind="click: updateMacro" class="btn btn-primary" type="button" value="<%=Services.TextService.Localize("general/ok")%>" />
</cc2:Pane>
@@ -66,7 +66,7 @@
</cc2:Pane>
<cc2:Pane runat="server" CssClass="btn-toolbar umb-btn-toolbar">
<a class="btn btn-link" data-bind="click: cancelModal" ><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<a class="btn btn-link" data-bind="click: cancelModal" ><%=Services.TextService.Localize("general/cancel")%></a>
<asp:Button ID="bt_insert" runat="server" CssClass="btn btn-primary" Text="ok" OnClick="renderProperties"></asp:Button>
</cc2:Pane>
</asp:Panel>

2
src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
View File

@@ -66,7 +66,7 @@
<div id="formDiv">
<p><%= Services.TextService.Localize("defaultdialogs/recycleBinWarning")%></p>
<input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=umbraco.ui.Text("defaultdialogs", "confirmEmptyTrashcan", umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture), UmbracoUser)%></label>
<input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=Services.TextService.Localize("defaultdialogs/confirmEmptyTrashcan", new[] { umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)})%></label>
</div>
</cc1:PropertyPanel>
</cc1:Pane>

2
src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpageContent.aspx
View File

@@ -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", this.getUser())%></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="<%= Services.TextService.Localize("insert") %>" />
</cc1:Pane>
</asp:Content>

2
src/Umbraco.Web.UI/umbraco/dialogs/insertMasterpagePlaceholder.aspx
View File

@@ -30,7 +30,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", this.getUser())%></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="<%= Services.TextService.Localize("insert") %>" />
</cc1:Pane>
</asp:Content>

290
src/Umbraco.Web.UI/umbraco/dialogs/insertTable.aspx
View File

@@ -1,290 +0,0 @@
<%@ Page language="c#" Codebehind="insertTable.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.insertTable" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<HTML>
<HEAD>
<title>Insert Table</title>
<meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
<meta name="CODE_LANGUAGE" Content="C#">
<meta name="vs_defaultClientScript" content="JavaScript">
<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
<LINK href="../css/umbracoGui.css" type="text/css" rel="stylesheet">
<style>BODY { MARGIN: 2px }
</style>
<script language="javascript">
function insertTable()
{
theForm = document.tableForm
// Indsaml tabel info
var tableCol = theForm.tableCol[theForm.tableCol.selectedIndex].text;
var tableRow = theForm.tableRow[theForm.tableRow.selectedIndex].text;
var tableJust = theForm.tableJust[theForm.tableJust.selectedIndex].text;
var tableWidth = theForm.tableWidth.value;
var tableHeight = theForm.tableHeight.value;
var tablePadding = theForm.tablePadding.value;
var tableSpacing = theForm.tableSpacing.value;
// hvis der ikke er sat padding eller spacing, skal de sættes til nul
if (tablePadding == '') tablePadding = '0';
if (tableSpacing == '') tableSpacing = '0';
var tableBorder = theForm.tableBorder[theForm.tableBorder.selectedIndex].text;
var tableClass = "";
if (theForm.tableClass.length > 0)
tableClass = theForm.tableClass[theForm.tableClass.selectedIndex].value;
// Hvis tabellen blot redigeres, skal vi ikke generere kode
if (theForm.editMode.value != '') {
var tableTag = new Array( tableJust,
tableWidth,
tableHeight,
tablePadding,
tableSpacing,
tableBorder,
tableClass);
} else {
// vi skal lave kode
var tableTag = '<TABLE';
if (tableJust != '') tableTag += ' ALIGN="'+ tableJust + '"';
if (tableWidth != '') tableTag += ' WIDTH="'+ tableWidth + '"';
if (tableHeight != '') tableTag += ' HEIGHT="'+ tableHeight + '"';
if (tablePadding != '') tableTag += ' CELLPADDING="'+ tablePadding + '"';
if (tableSpacing != '') tableTag += ' CELLSPACING="'+ tableSpacing + '"';
if (tableBorder != '') tableTag += ' BORDER="'+ tableBorder + '"';
if (tableClass != '') tableTag += ' CLASS="'+ tableClass + '"';
tableTag += '>\n';
// kolonner og rækker
for (i=1; i<=tableRow;i++) {
tableTag += '\t<TR>\n';
for(j=1; j<=tableCol;j++) {
tableTag += '\t\t<TD></TD>\n';
}
tableTag += '\t</TR>\n';
}
tableTag += '</TABLE>\n';
}
window.returnValue = tableTag;
window.close();
}
</script>
</HEAD>
<body MS_POSITIONING="GridLayout">
<h3><%=umbraco.ui.Text("defaultdialogs", "inserttable", this.getUser())%></h3>
<br />
<span class="guiDialogMedium"><%=umbraco.ui.Text("general", "size", this.getUser())%></span>
<hr size=1 noshade>
<TABLE WIDTH="100%" CELLPADDING=4 CELLSPACING=0 class="propertyPane">
<form id="tableForm" runat="server">
<input type="hidden" name="editMode" >
<TR>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("defaultdialogs", "tableColumns", this.getUser())%>
</TD>
<td class="propertyContent">
<select name="tableCol" size="1" class="guiInputText" >
<option selected>1
<option>2
<option>3
<option>4
<option>5
<option>6
<option>7
<option>8
<option>9
<option>10
<option>11
<option>12
<option>13
<option>14
<option>15
<option>16
<option>17
<option>18
<option>19
<option>20
<option>21
<option>22
<option>23
<option>24
<option>25
<option>26
<option>27
<option>28
<option>29
<option>30
<option>31
<option>32
<option>33
<option>34
<option>35
<option>36
<option>37
<option>38
<option>39
<option>40
<option>41
<option>42
<option>43
<option>44
<option>45
<option>46
<option>47
<option>48
<option>49
<option>50</option>
</select>
</td>
</TR>
<TR>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("defaultdialogs", "tableRows", this.getUser())%>
</TD>
<td class="propertyContent">
<select name="tableRow" size="1" class="guiInputText" >
<option selected>1
<option>2
<option>3
<option>4
<option>5
<option>6
<option>7
<option>8
<option>9
<option>10
<option>11
<option>12
<option>13
<option>14
<option>15
<option>16
<option>17
<option>18
<option>19
<option>20
<option>21
<option>22
<option>23
<option>24
<option>25
<option>26
<option>27
<option>28
<option>29
<option>30
<option>31
<option>32
<option>33
<option>34
<option>35
<option>36
<option>37
<option>38
<option>39
<option>40
<option>41
<option>42
<option>43
<option>44
<option>45
<option>46
<option>47
<option>48
<option>49
<option>50</option>
</select>
</td>
</TR>
</TABLE>
<br />
<span class="guiDialogMedium"><%=umbraco.ui.Text("general", "layout", this.getUser())%></span>
<hr size=1 noshade>
<TABLE WIDTH="100%" CELLPADDING=4 CELLSPACING=0 class="propertyPane">
<TR>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("general", "justify", this.getUser())%>
</TD>
<TD class="propertyContent align=" right?>
<select class="guiInputText"
size=1 name=tableJust>
<option selected>
<option>Left
<option>Right
<option>Center</option>
</select> </TD>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("general", "width", this.getUser())%>
</TD>
<td class="propertyContent">
<input type="text" name="tableWidth" value="100%" class="guiInputText" size="4" maxlength="4">
</td>
</TR>
<TR>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("general", "innerMargin", this.getUser())%>
</TD>
<TD class="propertyContent align=" right?>
<input class="guiInputText"
maxlength="4" type=text size=4 name=tablePadding> </TD>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("general", "height", this.getUser())%>
</TD>
<td class="propertyContent">
<input type="text" name="tableHeight" class="guiInputText" size="4" maxlength="4">
</td>
</TR>
<TR>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("general", "cellMargin", this.getUser())%>
</TD>
<TD class="propertyContent align=" right?>
<input class="guiInputText"
maxlength="4" type=text size=4 name=tableSpacing> </TD>
<TD class="propertyHeader" width="200">
&nbsp;
</TD>
<td class="propertyContent">
&nbsp;
</td>
</TR>
</TABLE>
<br />
<span class="guiDialogMedium"><%=umbraco.ui.Text("general", "design", this.getUser())%></span>
<hr size=1 noshade>
<TABLE WIDTH="100%" CELLPADDING=4 CELLSPACING=0 class="propertyPane">
<TR>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("general", "border", this.getUser())%>
</TD>
<td class="propertyContent">
<select name="tableBorder" size="1" class="guiInputText">
<option selected>0
<option>1
<option>2
<option>3</option>
</select>
</td>
<TD class="propertyHeader" width="200">
<%=umbraco.ui.Text("buttons", "styleChoose", this.getUser())%>
</TD>
<td class="propertyContent">
<asp:DropDownList Runat="server" ID="tableClass"></asp:DropDownList>
</td>
</TR></FORM>
</TABLE>
&nbsp;
<input type="button" class="guiInputButton" onClick="if (confirm('<%=Services.TextService.Localize("areyousure").Replace("'", "\\'")%>')) window.close();" value="<%=Services.TextService.Localize("cancel")%>"> &nbsp;
<input type="button" class="guiInputButton" onClick="insertTable()" value="<%=Services.TextService.Localize("insert")%>">
</body>
</HTML>

4
src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
View File

@@ -16,9 +16,9 @@
if (id > 0)
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
else{
//document.getElementById("pageNameContent").innerHTML = "'<strong><%=umbraco.ui.Text(Request.CleanForXss("app"))%></strong>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>";
//document.getElementById("pageNameContent").innerHTML = "'<strong><%=Services.TextService.Localize(Request.CleanForXss("app"))%></strong>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>";
jQuery("#pageNameContent").html("<strong><%=umbraco.ui.Text(Request.CleanForXss("app"))%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>");
jQuery("#pageNameContent").html("<strong><%=Services.TextService.Localize(Request.CleanForXss("app"))%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>");
jQuery("#pageNameHolder").attr("class","success");
}
}

12
src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
View File

@@ -11,7 +11,7 @@
if (treePicker > 0) {
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateLoginTitle);
} else
document.getElementById("loginTitle").innerHTML = "<strong><%=umbraco.ui.Text("content", base.getUser())%></strong>";
document.getElementById("loginTitle").innerHTML = "<strong><%=Services.TextService.Localize("content")%></strong>";
}
}
@@ -26,7 +26,7 @@
if (treePicker > 0) {
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateErrorTitle);
} else
document.getElementById("errorTitle").innerHTML = "<strong><%=umbraco.ui.Text("content", base.getUser())%></strong>";
document.getElementById("errorTitle").innerHTML = "<strong><%=Services.TextService.Localize("content")%></strong>";
}
}
function updateErrorTitle(result) {
@@ -91,8 +91,8 @@
<asp:RadioButton GroupName="mode" ID="rb_simple" runat="server" Checked="true" />
<label for="body_rb_simple">
<h4 class="pa-access-header"><%= umbraco.ui.Text("publicAccess", "paSimple", base.getUser())%></h4>
<p class="pa-access-description"><%= umbraco.ui.Text("publicAccess", "paSimpleHelp", base.getUser())%></p>
<h4 class="pa-access-header"><%= Services.TextService.Localize("publicAccess/paSimple")%></h4>
<p class="pa-access-description"><%= Services.TextService.Localize("publicAccess/paSimpleHelp")%></p>
</label>
</div>
@@ -101,8 +101,8 @@
<asp:RadioButton GroupName="mode" ID="rb_advanced" runat="server"/>
<label for="body_rb_advanced">
<h4 class="pa-access-header"><%= umbraco.ui.Text("publicAccess", "paAdvanced", base.getUser())%></h4>
<p class="pa-access-description"><%= umbraco.ui.Text("publicAccess", "paAdvancedHelp", base.getUser())%></p>
<h4 class="pa-access-header"><%= Services.TextService.Localize("publicAccess/paAdvanced")%></h4>
<p class="pa-access-description"><%= Services.TextService.Localize("publicAccess/paAdvancedHelp")%></p>
<asp:Panel runat="server" Visible="false" ID="p_noGroupsFound" CssClass="error">
<p>

4
src/Umbraco.Web.UI/umbraco/dialogs/publish.aspx
View File

@@ -39,13 +39,13 @@
<div class="propertyDiv" data-bind="visible: processStatus() == 'init'">
<p>
<%= umbraco.ui.Text("publish", "publishHelp", PageName, UmbracoUser) %>
<%= Services.TextService.Localize("publish/publishHelp", new[] { PageName}) %>
</p>
<div>
<input type="checkbox" id="publishAllCheckBox" data-bind="checked: publishAll" />
<label for="publishAllCheckBox">
<%=umbraco.ui.Text("publish", "publishAll", PageName, UmbracoUser) %>
<%=Services.TextService.Localize("publish/publishAll", new[] { PageName}) %>
</label>
</div>

2
src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
View File

@@ -62,7 +62,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
<a id="closeWindowButton" href="#" class="btn btn-link"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
<a id="closeWindowButton" href="#" class="btn btn-link"><%=Services.TextService.Localize("general/cancel")%></a>
<input id="submitButton" type="button" class="btn btn-primary" value="<%=Services.TextService.Localize("save") %>" />
</div>

2
src/Umbraco.Web.UI/umbraco/members/EditMemberGroup.aspx
View File

@@ -10,7 +10,7 @@
<table id="Table1" width="100%">
<tr>
<th width="15%">
<%=umbraco.ui.Text("name", base.getUser())%>
<%=Services.TextService.Localize("name")%>
</th>
<td>
<asp:TextBox ID="NameTxt" Width="200px" runat="server"></asp:TextBox>

2
src/Umbraco.Web.UI/umbraco/users/NodePermissions.ascx
View File

@@ -25,7 +25,7 @@
<li>
<input type="checkbox" name='<%#"chkPermission" + DataBinder.Eval(Container, "ItemIndex").ToString() %>' id='<%#"chkPermission" + DataBinder.Eval(Container, "ItemIndex").ToString() %>' value='<%#((AssignedPermission)Container.DataItem).Permission.Letter %>' <%#(((AssignedPermission)Container.DataItem).HasPermission ? "checked='true'" : "") %> />
<label for='<%#"chkPermission" + DataBinder.Eval(Container, "ItemIndex").ToString() %>' class='checkbox inline <%#(((AssignedPermission)Container.DataItem).HasPermission ? "activePermission" : "") %>'>
<%# umbraco.ui.GetText(((AssignedPermission)Container.DataItem).Permission.Alias) %>
<%# Services.TextService.Localize(((AssignedPermission)Container.DataItem).Permission.Alias) %>
</label>
</li>
</ItemTemplate>

3
src/Umbraco.Web/LegacyActions/Action.cs
View File

@@ -6,6 +6,7 @@ using System.Text.RegularExpressions;
using umbraco;
using umbraco.interfaces;
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Core.Logging;
using TypeFinder = Umbraco.Core.TypeFinder;
@@ -115,7 +116,7 @@ namespace Umbraco.Web.LegacyActions
icon = "images/" + icon;
_actionJsList += string.Format(",\n\tmenuItem(\"{0}\", \"{1}\", \"{2}\", \"{3}\")",
action.Letter, icon, ui.GetText("actions", action.Alias, language), action.JsFunctionName);
action.Letter, icon, ApplicationContext.Current.Services.TextService.Localize("actions/"+ action.Alias, new[] { language }), action.JsFunctionName);
}
catch (Exception ee)
{

6
src/Umbraco.Web/Models/Mapping/SectionModelMapper.cs
View File

@@ -1,5 +1,7 @@
using AutoMapper;
using System.Collections.Generic;
using AutoMapper;
using Umbraco.Core;
using Umbraco.Core.Services;
using Umbraco.Core.Models.Mapping;
using Umbraco.Web.Models.ContentEditing;
using umbraco;
@@ -13,7 +15,7 @@ namespace Umbraco.Web.Models.Mapping
config.CreateMap<Core.Models.Section, Section>()
.ForMember(
dto => dto.Name,
expression => expression.MapFrom(section => ui.Text("sections", section.Alias)))
expression => expression.MapFrom(section => applicationContext.Services.TextService.Localize("sections/" + section.Alias, (IDictionary<string, string>)null)))
.ReverseMap(); //backwards too!
}
}

8
src/Umbraco.Web/Routing/UrlProviderExtensions.cs
View File

@@ -2,6 +2,8 @@
using System.Collections.Generic;
using Umbraco.Core.Models;
using umbraco;
using Umbraco.Core;
using Umbraco.Core.Services;
namespace Umbraco.Web.Routing
{
@@ -26,7 +28,7 @@ namespace Umbraco.Web.Routing
if (content.HasPublishedVersion == false)
{
urls.Add(ui.Text("content", "itemNotPublished", umbracoContext.Security.CurrentUser));
urls.Add(ApplicationContext.Current.Services.TextService.Localize("content/itemNotPublished"));
return urls;
}
@@ -44,9 +46,9 @@ namespace Umbraco.Web.Routing
while (parent != null && parent.Published);
if (parent == null) // oops - internal error
urls.Add(ui.Text("content", "parentNotPublishedAnomaly", umbracoContext.Security.CurrentUser));
urls.Add(ApplicationContext.Current.Services.TextService.Localize("content/parentNotPublishedAnomaly"));
else
urls.Add(ui.Text("content", "parentNotPublished", parent.Name, umbracoContext.Security.CurrentUser));
urls.Add(ApplicationContext.Current.Services.TextService.Localize("content/parentNotPublished", new[] { parent.Name }));
}
else
{

2
src/Umbraco.Web/Trees/ApplicationTreeController.cs
View File

@@ -72,7 +72,7 @@ namespace Umbraco.Web.Trees
}
var multiTree = SectionRootNode.CreateMultiTreeSectionRoot(rootId, collection);
multiTree.Name = ui.Text("sections", application);
multiTree.Name = Services.TextService.Localize("sections/"+ application);
return multiTree;
}

2
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -45,7 +45,7 @@ namespace Umbraco.Web.Trees
{
node.MenuUrl = "";
}
node.Name = ui.Text("sections", Constants.Trees.Content);
node.Name = Services.TextService.Localize("sections/"+ Constants.Trees.Content);
return node;
}

3
src/Umbraco.Web/umbraco.presentation/umbraco/users/NodePermissions.ascx.cs
View File

@@ -4,6 +4,7 @@ using umbraco.interfaces;
using umbraco.BusinessLogic;
using Umbraco.Web;
using Umbraco.Web.LegacyActions;
using Umbraco.Web.UI.Controls;
using Action = Umbraco.Web.LegacyActions.Action;
namespace umbraco.cms.presentation.user
@@ -12,7 +13,7 @@ namespace umbraco.cms.presentation.user
/// <summary>
/// An object to display the current permissions for a user and a node.
/// </summary>
public partial class NodePermissions : System.Web.UI.UserControl
public partial class NodePermissions : UmbracoUserControl
{
protected override void OnInit(EventArgs e) {

10
src/umbraco.cms/businesslogic/workflow/Notification.cs
View File

@@ -1,3 +1,5 @@
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using System;
using System.Collections.Generic;
using System.Globalization;
@@ -80,12 +82,12 @@ namespace umbraco.cms.businesslogic.workflow
var pUser = ApplicationContext.Current.Services.UserService.GetUserById(performingUser.Id);
nService.SendNotifications(
pUser, documentObject.ContentEntity, action.Letter.ToString(CultureInfo.InvariantCulture), ui.Text(action.Alias),
pUser, documentObject.ContentEntity, action.Letter.ToString(CultureInfo.InvariantCulture), ApplicationContext.Current.Services.TextService.Localize(action.Alias),
new HttpContextWrapper(HttpContext.Current),
(user, strings) => ui.Text("notifications", "mailSubject", strings, mailingUser),
(user, strings) => ApplicationContext.Current.Services.TextService.Localize("notifications/mailSubject", mailingUser.UserEntity.GetUserCulture(ApplicationContext.Current.Services.TextService), strings),
(user, strings) => UmbracoConfig.For.UmbracoSettings().Content.DisableHtmlEmail
? ui.Text("notifications", "mailBody", strings, mailingUser)
: ui.Text("notifications", "mailBodyHtml", strings, mailingUser));
? ApplicationContext.Current.Services.TextService.Localize("notifications/mailBody", mailingUser.UserEntity.GetUserCulture(ApplicationContext.Current.Services.TextService), strings)
: ApplicationContext.Current.Services.TextService.Localize("notifications/mailBodyHtml", mailingUser.UserEntity.GetUserCulture(ApplicationContext.Current.Services.TextService), strings));
}
/// <summary>