diff --git a/templates/web/edugain/complete_challenge.html.tt2 b/templates/web/edugain/complete_challenge.html.tt2
index a99367c3e64983d0e171fac4bf35998c0f769fee..e03924be54363aa671e0cca5571a373cab977982 100644
--- a/templates/web/edugain/complete_challenge.html.tt2
+++ b/templates/web/edugain/complete_challenge.html.tt2
@@ -30,7 +30,7 @@
[% PROCESS $template scope=account.scope() id=account.id() | trim %]
<li>
<input type="checkbox" id="[% profile %]" name="profiles" value="[% profile %]" checked/>
- <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${lh.language_tag()} %]"></span></label>
+ <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${l10n.language_tag()} %]"></span></label>
</li>
[% END %]
</ul>
diff --git a/templates/web/edugain/create_accounts.html.tt2 b/templates/web/edugain/create_accounts.html.tt2
index d7d887767d9e1819ed6720917bf8b64d5be7726f..45d33331bb3ad53994e09359fdd510c7841f6928 100644
--- a/templates/web/edugain/create_accounts.html.tt2
+++ b/templates/web/edugain/create_accounts.html.tt2
@@ -22,7 +22,7 @@
<div class="account small-12 medium-6 large-4 columns">
<h3>[% c.loc("Account profile: [_1]", account.profile()) %]</h3>
- <div class="description">[% description.${lh.language_tag()} %].</div>
+ <div class="description">[% description.${l10n.language_tag()} %].</div>
<table>
<tr>
diff --git a/templates/web/edugain/index.html.tt2 b/templates/web/edugain/index.html.tt2
index 4c3c0dacdb86acde69d0ed9b675e894aea29e421..609a17e3597549efed5644b6442be151a137fc67 100644
--- a/templates/web/edugain/index.html.tt2
+++ b/templates/web/edugain/index.html.tt2
@@ -1,5 +1,5 @@
<!doctype html>
-<html lang="[% lh.language_tag() %]">
+<html lang="[% l10n.language_tag() %]">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
@@ -45,17 +45,17 @@
<span>Language</span>
<ul class="et-submenu">
<li class="et-submenu-option">
- <a [% IF lh.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') %]"[% END %] data-lang="en" title="English">
+ <a [% IF l10n.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') %]"[% END %] data-lang="en" title="English">
<img src="images/en.png" />
<label>English</label>
- [% IF lh.language_tag() == "en" %]<span class="fa fa-check"></span>[% END %]
+ [% IF l10n.language_tag() == "en" %]<span class="fa fa-check"></span>[% END %]
</a>
</li>
<li class="et-submenu-option">
- <a [% IF lh.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') %]"[% END %] data-lang="fr" title="Français">
+ <a [% IF l10n.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') %]"[% END %] data-lang="fr" title="Français">
<img src="images/fr.png" />
<label>Français</label>
- [% IF lh.language_tag() == "fr" %]<span class="fa fa-check"></span>[% END %]
+ [% IF l10n.language_tag() == "fr" %]<span class="fa fa-check"></span>[% END %]
</a>
</li>
</ul>
diff --git a/templates/web/renater/complete_challenge.html.tt2 b/templates/web/renater/complete_challenge.html.tt2
index 9d598e9ff879fb33804acfcd11b76a676a9a5047..f7b5ea3038fd4c8e3c3b9a9379ac09288bcfaebe 100644
--- a/templates/web/renater/complete_challenge.html.tt2
+++ b/templates/web/renater/complete_challenge.html.tt2
@@ -30,7 +30,7 @@
[% PROCESS $template scope=account.scope() id=account.id() | trim %]
<li>
<input type="checkbox" id="[% profile %]" name="profiles" value="[% profile %]" checked/>
- <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${lh.language_tag()} %]"></span></label>
+ <label for="[% profile %]">[% profile %] <span class="fa fa-question-circle" title="[% description.${l10n.language_tag()} %]"></span></label>
</li>
[% END %]
</ul>
diff --git a/templates/web/renater/create_accounts.html.tt2 b/templates/web/renater/create_accounts.html.tt2
index 4bb6301943046aea7db606da69ac4d2713bde2da..141db13da4006b0ca70f7c6157edff2f0bbc750a 100644
--- a/templates/web/renater/create_accounts.html.tt2
+++ b/templates/web/renater/create_accounts.html.tt2
@@ -24,7 +24,7 @@
<div class="account small-12 medium-6 large-4 columns">
<h3>[% c.loc("Account profile: [_1]", account.profile()) %]</h3>
- <div class="description">[% description.${lh.language_tag()} %].</div>
+ <div class="description">[% description.${l10n.language_tag()} %].</div>
<table>
<tr>
diff --git a/templates/web/renater/index.html.tt2 b/templates/web/renater/index.html.tt2
index d5925273248037f8b19e226432380fac27ba4a8f..32a1099d0dfff8b7fa6a06bd256d9bc244a6c4fd 100644
--- a/templates/web/renater/index.html.tt2
+++ b/templates/web/renater/index.html.tt2
@@ -1,5 +1,5 @@
<!doctype html>
-<html lang="[% lh.language_tag() %]">
+<html lang="[% l10n.language_tag() %]">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@@ -62,17 +62,17 @@
</a>
<ul class="submenu vertical" data-submenu>
<li>
- <a [% IF lh.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') %]"[% END %] data-lang="en" title="English">
+ <a [% IF l10n.language_tag() == "en" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'en') %]"[% END %] data-lang="en" title="English">
<img src="images/en.png" />
<label>English</label>
- [% IF lh.language_tag() == "en" %]<span class="fa fa-check"></span>[% END %]
+ [% IF l10n.language_tag() == "en" %]<span class="fa fa-check"></span>[% END %]
</a>
</li>
<li>
- <a [% IF lh.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') %]"[% END %] data-lang="fr" title="Français">
+ <a [% IF l10n.language_tag() == "fr" %]class="nocursor"[% ELSE %]href="[% c.url_with().query(lang => 'fr') %]"[% END %] data-lang="fr" title="Français">
<img src="images/fr.png" />
<label>Français</label>
- [% IF lh.language_tag() == "fr" %]<span class="fa fa-check"></span>[% END %]
+ [% IF l10n.language_tag() == "fr" %]<span class="fa fa-check"></span>[% END %]
</a>
</li>
</ul>