Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Doc language fix #1062

Merged
merged 2 commits into from
Jul 1, 2013
Merged

Doc language fix #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0f2eb6
[#1062] Fix doc language link
tobes Jul 1, 2013
7315cc8
[#1062] Remove lang from docs
tobes Jul 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ckan/templates/admin/config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/{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>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/admin/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/{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
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/{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>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/package/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/{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 %}
Expand Down