From aa96e8654ce5d9465768979e65577367fda64a0b Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 1 Jul 2013 17:01:55 +0100
Subject: [PATCH] [#1062] Toby is stupid

Conflicts:

	ckan/templates/admin/config.html
	ckan/templates/admin/index.html
	ckan/templates/footer.html
	ckan/templates/package/search.html
---
 ckan/templates/admin/config.html   | 2 +-
 ckan/templates/admin/index.html    | 2 +-
 ckan/templates/footer.html         | 2 +-
 ckan/templates/package/search.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckan/templates/admin/config.html b/ckan/templates/admin/config.html
index 7e89ba9e763..0ec27d1e687 100644
--- a/ckan/templates/admin/config.html
+++ b/ckan/templates/admin/config.html
@@ -22,7 +22,7 @@ <h2 class="module-heading">
     <div class="module-content">
       {% set about_url = h.url_for(controller='home', action='about') %}
       {% set home_url = h.url_for(controller='home', action='index') %}
-      {% set docs_url = "http://docs.ckan.org/{0}/{1}/theming.html".format(request.environ.CKAN_LANG, g.ckan_doc_version) %}
+      {% set docs_url = "http://docs.ckan.org/en/{0}/theming.html".format(g.ckan_doc_version) %}
       {% trans %}
         <p><strong>Site Title:</strong> This is the title of this CKAN instance
           It appears in various places throughout CKAN.</p>
diff --git a/ckan/templates/admin/index.html b/ckan/templates/admin/index.html
index e415d406fdb..ee007d66fcd 100644
--- a/ckan/templates/admin/index.html
+++ b/ckan/templates/admin/index.html
@@ -15,7 +15,7 @@ <h2 class="module-heading">
       {{ _('What are sysadmins?') }}
     </h2>
     <div class="module-content">
-      {% set docs_url = "http://docs.ckan.org/{0}/{1}/paster.html#sysadmin-give-sysadmin-rights".format(request.environ.CKAN_LANG, g.ckan_doc_version) %}
+      {% set docs_url = "http://docs.ckan.org/en/{0}/paster.html#sysadmin-give-sysadmin-rights".format(g.ckan_doc_version) %}
       {% trans %}
         <p>A sysadmin is someone that has full control over a CKAN instance.
           You can only add CKAN sysadmins via the <code>sysadmin</code> paster
diff --git a/ckan/templates/footer.html b/ckan/templates/footer.html
index fca1141eb46..7c6dc9a4d2b 100644
--- a/ckan/templates/footer.html
+++ b/ckan/templates/footer.html
@@ -10,7 +10,7 @@
           </ul>
           <ul class="unstyled">
             {% block footer_links_ckan %}
-              {% set api_url = 'http://docs.ckan.org/{0}/{1}/api.html'.format(request.environ.CKAN_LANG, g.ckan_doc_version) %}
+              {% set api_url = 'http://docs.ckan.org/en/{0}/api.html'.format(g.ckan_doc_version) %}
               <li><a href="{{ api_url }}">{{ _('CKAN API') }}</a></li>
               <li><a href="http://www.okfn.org/">{{ _('Open Knowledge Foundation') }}</a></li>
               <li><a href="http://www.opendefinition.org/okd/"><img src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png"></a></li>
diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
index 25a4d80974f..7bf773bd82e 100644
--- a/ckan/templates/package/search.html
+++ b/ckan/templates/package/search.html
@@ -49,7 +49,7 @@
     <div class="module-content">
       <small>
         {% set api_link = h.link_to(_('API'), h.url_for(controller='api', action='get_api', ver=3)) %}
-        {% set api_doc_link = h.link_to(_('API Docs'), 'http://docs.ckan.org/{0}/{1}/api.html'.format(request.environ.CKAN_LANG, g.ckan_doc_version)) %}
+        {% set api_doc_link = h.link_to(_('API Docs'), 'http://docs.ckan.org/en/{0}/api.html'.format(g.ckan_doc_version)) %}
         {% if g.dumps_url -%}
           {% set dump_link = h.link_to(_('full {format} dump').format(format=g.dumps_format), g.dumps_url) %}
           {% trans %}