Get rid of multiple-laguages plugin.

Move all posts to the regular _post directory, but under corresponding
language subdirs. Also replace the generic pages with language specific
ones. This should make the urls nicer and more coherent too. Finally,
get rid of the "t"-translate tag. Will probably have to reintroduce a
similar tag later, but for now, just hardcode norwegian labels.

6 files changed, 11 insertions, 11 deletions

diff --git a/blog/_includes/head.html b/blog/_includes/head.html
index eac4a09..08367a9 100644
--- a/blog/_includes/head.html
+++ b/blog/_includes/head.html
@@ -5,7 +5,7 @@
    <title>
      {{ site.title }}
      {% if page.title %}
-       - {% page_title page.title %}
+       - {{ page.title }}
      {% endif %}
    </title>
    <meta name="description" content="{{ site.description }}">
diff --git a/blog/_includes/language-switcher.html b/blog/_includes/language-switcher.html
index ee2edfc..604c914 100644
--- a/blog/_includes/language-switcher.html
+++ b/blog/_includes/language-switcher.html
@@ -1,7 +1,7 @@
 <span class="language-switcher">
   {% if site.lang == "nb" %}
-    <a href="{{ site.baseurl_root | append: "/en" }}">{% t global.english %}</a>
+    <a href="{{ site.baseurl_root | append: "/en" }}">English</a>
   {% else if site.lang == "en" %}
-    <a href="{{ site.baseurl_root | append: "/" }}">{% t global.norwegian %}</a>
+    <a href="{{ site.baseurl_root | append: "/" }}">Norsk</a>
   {% endif %}
 </span>
diff --git a/blog/_includes/menubar.html b/blog/_includes/menubar.html
index 3076326..4d7237f 100644
--- a/blog/_includes/menubar.html
+++ b/blog/_includes/menubar.html
@@ -1,10 +1,10 @@
 <div id="page-menu">
   <nav class="site-nav">
-    <a class="page-link" href="{{ site.baseurl | append: "/" }}">{% t titles.home %}</a>
-    <a class="page-link" href="{{ site.baseurl_root | append: "/registration" }}">{% t titles.registration %}</a>
+    <a class="page-link" href="{{ site.baseurl | append: "/" }}">Hjem</a>
+    <a class="page-link" href="{{ site.baseurl_root | append: "/registration" }}">Registrering</a>
     {% for page in site.pages %}
       {% if page.title and (!page.hidden == true) %}
-        <a class="page-link" href="{{ page.url | prepend: site.baseurl | remove: 'index.html' }}">{% page_title page.title %}</a>
+        <a class="page-link" href="{{ page.url | prepend: site.baseurl | remove: 'index.html' }}">{{ page.title }}</a>
       {% endif %}
     {% endfor %}
     {% include language-switcher.html %}
diff --git a/blog/_includes/news.html b/blog/_includes/news.html
index e9f6138..f7b893d 100644
--- a/blog/_includes/news.html
+++ b/blog/_includes/news.html
@@ -1,5 +1,5 @@
 <section id="news">
-  <h2>{% t home.latest_news %}</h2>
+  <h2>Nyheter</h2>
   {% for p in site.posts limit: 5 %}
     {% if p != page %}
       {% if include.sidebar %}
diff --git a/blog/_includes/pagination.html b/blog/_includes/pagination.html
index 061b03f..a1da307 100644
--- a/blog/_includes/pagination.html
+++ b/blog/_includes/pagination.html
@@ -1,10 +1,10 @@
 <!-- Pagination links -->
 <section class="pagination">
-  <span class="page_number ">{% t home.page_no %} {{ paginator.page }} / {{ paginator.total_pages }}</span>
+  <span class="page_number ">Side {{ paginator.page }} / {{ paginator.total_pages }}</span>
   {% if paginator.previous_page %}
-    <a href="{{ paginator.previous_page_path | prepend: site.baseurl }}" class="previous">{% t home.prev_page %}</a>
+    <a href="{{ paginator.previous_page_path | prepend: site.baseurl }}" class="previous">Forrige</a>
   {% endif %}
   {% if paginator.next_page %}
-    <a href="{{ paginator.next_page_path | prepend: site.baseurl }}" class="next">{% t home.next_page %}</a>
+    <a href="{{ paginator.next_page_path | prepend: site.baseurl }}" class="next">Neste</a>
   {% endif %}
 </section>
diff --git a/blog/_includes/post-excerpt.html b/blog/_includes/post-excerpt.html
index b3616d8..84839b1 100644
--- a/blog/_includes/post-excerpt.html
+++ b/blog/_includes/post-excerpt.html
@@ -8,6 +8,6 @@
       </div>
     {% endif %}
     {{ post.excerpt }}
-    <p><a href="{{ post.url | prepend: site.baseurl }}">{% t global.read_more %}</a></p>
+    <p><a href="{{ post.url | prepend: site.baseurl }}">Mer...</a></p>
   </section>
 </article>