diff --git a/blog/templates/second-edition/index.html b/blog/templates/second-edition/index.html
index 286baa90..a0e10d7a 100644
--- a/blog/templates/second-edition/index.html
+++ b/blog/templates/second-edition/index.html
@@ -78,13 +78,18 @@
 {% block after_main %}
 <aside class="page-aside-right">
     <div class="block" id="language-selector">
-        <h2>Languages</h2>
-        <ul>
-            <li><a href="/">English (Original)</a></li>
-            {% for lang in config.languages %}
-                <li data-lang-switch-to="{{ lang.code }}" class=""><a href="/{{ lang.code }}">{{ lang.code }}</a></li>
-            {% endfor %}
-        </ul>
+        <h2>Other Languages</h2>
+        <ul>{%- for lang_code in config.languages | map(attribute="code") | concat(with="en") | sort -%}
+            {%- if lang_code != lang -%}
+                <li data-lang-switch-to="{{ lang_code }}" class="">
+                    {%- if lang_code == "en" -%}
+                        <a href="/">English (original)</a>
+                    {%- else -%}
+                        <a href="/{{ lang_code }}">{{ trans(key="lang_name", lang = lang_code) }}</a>
+                    {%- endif -%}
+                </li>
+            {%- endif %}
+        {% endfor %}</ul>
     </div>
     <div class="block">
         <h2>Recent Updates</h2>
diff --git a/blog/templates/second-edition/page.html b/blog/templates/second-edition/page.html
index 298ab6d9..d857a938 100644
--- a/blog/templates/second-edition/page.html
+++ b/blog/templates/second-edition/page.html
@@ -105,11 +105,15 @@
         {% if page.translations -%}
         <div class="block" id="language-selector">
             <h2>Other Languages</h2>
-            <ul>
-                {%- for translation in page.translations %}
-                <li data-lang-switch-to="{{ translation.lang }}" class=""><a href="{{ translation.permalink | safe }}">{{ translation.lang }} {% if translation.lang == "en" %}(original){% endif %}</a></li>
-                {%- endfor %}
-            </ul>
+            <ul>{%- for translation in page.translations | sort(attribute="lang") %}
+                <li data-lang-switch-to="{{ translation.lang }}" class=""><a href="{{ translation.permalink | safe }}">
+                    {%- if translation.lang == "en" -%}
+                        English (original)
+                    {%- else -%}
+                        {{ trans(key="lang_name", lang = translation.lang) }}
+                    {%- endif -%}
+                </a></li>
+            {% endfor %}</ul>
         </div>
         {%- endif %}