Skip to content

Commit 768ae5d

Browse files
committed
Fixing #12
LanguageManager is obsolete.
1 parent 40e40b6 commit 768ae5d

File tree

6 files changed

+24
-25
lines changed

6 files changed

+24
-25
lines changed

src/.nuget/NuGet.Config

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<solution>
4-
<add key="disableSourceControlIntegration" value="true" />
5-
</solution>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
66
</configuration>

src/BVNetwork.404Handler.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>BVN.404Handler</id>
55
<title>404 Handler for EPiServer</title>
6-
<version>4.2.0</version>
6+
<version>4.2.1</version>
77
<authors>BV Network</authors>
88
<owners>BV Network</owners>
99
<licenseUrl>https://www.coderesort.com/p/epicode/wiki/EpicodeLicense</licenseUrl>

src/Views/NotFoundRedirect/Deleted.ascx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<List<CustomRedirect>>" %>
22
<%@ Import Namespace="BVNetwork.NotFound.Core.CustomRedirects" %>
3-
<%@ Import Namespace="EPiServer.Core" %>
4-
3+
<%@ Import Namespace="EPiServer.Framework.Localization" %>
4+
55
<div class="notfound">
66
<div class="epi-formArea">
77
<fieldset>
8-
<%=string.Format(LanguageManager.Instance.Translate("/gadget/redirects/deletedurls"), Model.Count)%>
8+
<%=string.Format(LocalizationService.Current.GetString("/gadget/redirects/deletedurls"), Model.Count)%>
99

1010
</fieldset>
1111
</div>
@@ -19,7 +19,7 @@
1919
<tr>
2020
<th>
2121
<label>
22-
<%=LanguageManager.Instance.Translate("/gadget/redirects/url")%></label>
22+
<%= Html.Translate("/gadget/redirects/url")%></label>
2323
</th>
2424
<th>&nbsp;</th>
2525
</tr>

src/Views/NotFoundRedirect/Ignored.ascx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<List<CustomRedirect>>" %>
22
<%@ Import Namespace="BVNetwork.NotFound.Core.CustomRedirects" %>
33
<%@ Import Namespace="EPiServer.Core" %>
4-
4+
<%@ Import Namespace="EPiServer.Framework.Localization" %>
5+
56
<div class="notfound">
67
<div class="epi-formArea">
78
<fieldset>
8-
<%=string.Format(LanguageManager.Instance.Translate("/gadget/redirects/ignoredsuggestions"), Model.Count)%>
9+
<%=string.Format(LocalizationService.Current.GetString("/gadget/redirects/ignoredsuggestions"), Model.Count)%>
910

1011
</fieldset>
1112
</div>
@@ -16,10 +17,10 @@
1617
<tr>
1718
<th>
1819
<label>
19-
<%=LanguageManager.Instance.Translate("/gadget/redirects/url")%></label>
20+
<%= Html.Translate("/gadget/redirects/url")%></label>
2021
</th>
2122
<th>
22-
<%=LanguageManager.Instance.Translate("/gadget/redirects/unignore")%>
23+
<%= Html.Translate("/gadget/redirects/unignore")%>
2324
</th>
2425
</tr>
2526
</thead>

src/Views/NotFoundRedirect/Redirects.ascx

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
<tr>
3434
<th>
3535
<label>
36-
<%=LanguageManager.Instance.Translate("/gadget/redirects/oldurl")%></label>
36+
<%= Html.Translate("/gadget/redirects/oldurl")%></label>
3737
</th>
3838
<th>
3939
<label>
40-
<%=LanguageManager.Instance.Translate("/gadget/redirects/newurl")%></label>
40+
<%= Html.Translate("/gadget/redirects/newurl")%></label>
4141
</th>
4242
<th style="text-align: center">
4343
<label>
44-
<%=LanguageManager.Instance.Translate("/gadget/redirects/wildcard")%></label>
44+
<%= Html.Translate("/gadget/redirects/wildcard")%></label>
4545
</th>
4646
<th>
4747
</th>
@@ -75,7 +75,7 @@
7575
<td class="longer">
7676
<%if (m.State.Equals((int)DataStoreHandler.State.Ignored))
7777
{%>
78-
<i>[<%=LanguageManager.Instance.Translate("/gadget/redirects/ignored")%>]</i>
78+
<i>[<%= Html.Translate("/gadget/redirects/ignored")%>]</i>
7979
<%}
8080
else
8181
{ %>

src/Views/NotFoundRedirect/Suggestions.ascx

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BVNetwork.NotFound.Models.RedirectIndexViewData>" %>
2-
32
<%@ Import Namespace="BVNetwork.NotFound.Core" %>
43
<%@ Import Namespace="BVNetwork.NotFound.Core.CustomRedirects" %>
54
<%@ Import Namespace="BVNetwork.NotFound.Core.Data" %>
6-
<%@ Import Namespace="EPiServer.Core" %>
7-
<%@ Import Namespace="EPiServer.Shell.Web.Mvc.Html" %>
5+
<%@ Import Namespace="EPiServer.Framework.Localization" %>
86
<script type="text/javascript">
97
108
function replaceArrow(inputid) {
@@ -39,16 +37,16 @@
3937
<tr>
4038
<th>
4139
<label>
42-
<%=LanguageManager.Instance.Translate("/gadget/redirects/oldurl")%></label>
40+
<%= Html.Translate("/gadget/redirects/oldurl")%></label>
4341
</th>
4442
<th>
4543
<label>
46-
<%=LanguageManager.Instance.Translate("/gadget/redirects/newurl")%></label>
44+
<%= Html.Translate("/gadget/redirects/newurl")%></label>
4745
</th>
4846

4947
<th style="text-align: center">
5048
<label>
51-
<%=LanguageManager.Instance.Translate("/gadget/redirects/ignore")%></label>
49+
<%= Html.Translate("/gadget/redirects/ignore")%></label>
5250
</th>
5351
</tr>
5452
</thead>
@@ -145,7 +143,7 @@
145143
<td class="shorter delete">
146144
<%= Html.ViewLink(
147145
"", // html helper
148-
LanguageManager.Instance.Translate("/gadget/redirects/ignoreexplanation"), // title
146+
LocalizationService.Current.GetString("/gadget/redirects/ignoreexplanation"), // title
149147
"IgnoreRedirect", // Action name
150148
"epi-quickLinksDelete epi-iconToolbar-item-link epi-iconToolbar-delete", // css class
151149
"Index",

0 commit comments

Comments
 (0)