Fixing #12

LanguageManager is obsolete.
Geta · Sep 1, 2016 · 768ae5d · 768ae5d
1 parent 40e40b6
commit 768ae5d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 25 deletions.
diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
 </configuration>
diff --git a/src/BVNetwork.404Handler.nuspec b/src/BVNetwork.404Handler.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>BVN.404Handler</id>
         <title>404 Handler for EPiServer</title>
-        <version>4.2.0</version>
+        <version>4.2.1</version>
         <authors>BV Network</authors>
         <owners>BV Network</owners>
         <licenseUrl>https://www.coderesort.com/p/epicode/wiki/EpicodeLicense</licenseUrl>

diff --git a/src/Views/NotFoundRedirect/Deleted.ascx b/src/Views/NotFoundRedirect/Deleted.ascx
@@ -1,11 +1,11 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<List<CustomRedirect>>" %>
 <%@ Import Namespace="BVNetwork.NotFound.Core.CustomRedirects" %>
-<%@ Import Namespace="EPiServer.Core" %>
-
+<%@ Import Namespace="EPiServer.Framework.Localization" %>
+
 <div class="notfound">
        <div class="epi-formArea">
             <fieldset>
-               <%=string.Format(LanguageManager.Instance.Translate("/gadget/redirects/deletedurls"), Model.Count)%>
+               <%=string.Format(LocalizationService.Current.GetString("/gadget/redirects/deletedurls"), Model.Count)%>
 
             </fieldset>
         </div>
@@ -19,7 +19,7 @@
             <tr>
                 <th>
                     <label>
-                        <%=LanguageManager.Instance.Translate("/gadget/redirects/url")%></label>
+                        <%= Html.Translate("/gadget/redirects/url")%></label>
                 </th>
                 <th>&nbsp;</th>
             </tr>

diff --git a/src/Views/NotFoundRedirect/Ignored.ascx b/src/Views/NotFoundRedirect/Ignored.ascx
@@ -1,11 +1,12 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<List<CustomRedirect>>" %>
 <%@ Import Namespace="BVNetwork.NotFound.Core.CustomRedirects" %>
 <%@ Import Namespace="EPiServer.Core" %>
-
+<%@ Import Namespace="EPiServer.Framework.Localization" %>
+
 <div class="notfound">
        <div class="epi-formArea">
             <fieldset>
-               <%=string.Format(LanguageManager.Instance.Translate("/gadget/redirects/ignoredsuggestions"), Model.Count)%>
+               <%=string.Format(LocalizationService.Current.GetString("/gadget/redirects/ignoredsuggestions"), Model.Count)%>
 
             </fieldset>
         </div>
@@ -16,10 +17,10 @@
             <tr>
                 <th>
                     <label>
-                        <%=LanguageManager.Instance.Translate("/gadget/redirects/url")%></label>
+                        <%= Html.Translate("/gadget/redirects/url")%></label>
                 </th>
                 <th>
-                 <%=LanguageManager.Instance.Translate("/gadget/redirects/unignore")%>
+                 <%= Html.Translate("/gadget/redirects/unignore")%>
                 </th>
             </tr>
         </thead>

diff --git a/src/Views/NotFoundRedirect/Redirects.ascx b/src/Views/NotFoundRedirect/Redirects.ascx
@@ -33,15 +33,15 @@
                 <tr>
                     <th>
                         <label>
-                            <%=LanguageManager.Instance.Translate("/gadget/redirects/oldurl")%></label>
+                            <%= Html.Translate("/gadget/redirects/oldurl")%></label>
                     </th>
                     <th>
                         <label>
-                            <%=LanguageManager.Instance.Translate("/gadget/redirects/newurl")%></label>
+                            <%= Html.Translate("/gadget/redirects/newurl")%></label>
                     </th>
                     <th style="text-align: center">
                         <label>
-                            <%=LanguageManager.Instance.Translate("/gadget/redirects/wildcard")%></label>
+                            <%= Html.Translate("/gadget/redirects/wildcard")%></label>
                     </th>
                     <th>
                     </th>
@@ -75,7 +75,7 @@
                 <td class="longer">
                     <%if (m.State.Equals((int)DataStoreHandler.State.Ignored))
                       {%>
-                    <i>[<%=LanguageManager.Instance.Translate("/gadget/redirects/ignored")%>]</i>
+                    <i>[<%= Html.Translate("/gadget/redirects/ignored")%>]</i>
                     <%}
                       else
                       {  %>

diff --git a/src/Views/NotFoundRedirect/Suggestions.ascx b/src/Views/NotFoundRedirect/Suggestions.ascx
@@ -1,10 +1,8 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BVNetwork.NotFound.Models.RedirectIndexViewData>" %>
-
 <%@ Import Namespace="BVNetwork.NotFound.Core" %>
 <%@ Import Namespace="BVNetwork.NotFound.Core.CustomRedirects" %>
 <%@ Import Namespace="BVNetwork.NotFound.Core.Data" %>
-<%@ Import Namespace="EPiServer.Core" %>
-<%@ Import Namespace="EPiServer.Shell.Web.Mvc.Html" %>
+<%@ Import Namespace="EPiServer.Framework.Localization" %>
 <script type="text/javascript">
 
     function replaceArrow(inputid) {
@@ -39,16 +37,16 @@
             <tr>
                 <th>
                     <label>
-                        <%=LanguageManager.Instance.Translate("/gadget/redirects/oldurl")%></label>
+                        <%= Html.Translate("/gadget/redirects/oldurl")%></label>
                 </th>
                 <th>
                     <label>
-                        <%=LanguageManager.Instance.Translate("/gadget/redirects/newurl")%></label>
+                        <%= Html.Translate("/gadget/redirects/newurl")%></label>
                 </th>
 
                 <th style="text-align: center">
                     <label>
-                        <%=LanguageManager.Instance.Translate("/gadget/redirects/ignore")%></label>
+                        <%= Html.Translate("/gadget/redirects/ignore")%></label>
                 </th>
             </tr>
         </thead>
@@ -145,7 +143,7 @@
             <td class="shorter delete">
                 <%= Html.ViewLink(
                                 "",  // html helper
-                                LanguageManager.Instance.Translate("/gadget/redirects/ignoreexplanation"),  // title
+                                LocalizationService.Current.GetString("/gadget/redirects/ignoreexplanation"),  // title
                                 "IgnoreRedirect", // Action name
                                 "epi-quickLinksDelete epi-iconToolbar-item-link epi-iconToolbar-delete", // css class
                                 "Index",