Skip to content

Commit

Permalink
Merge pull request #1073 from NatLibFi/updated-translation-templates
Browse files Browse the repository at this point in the history
Updated translation templates
  • Loading branch information
joelit authored Oct 6, 2020
2 parents a844b58 + cd25786 commit 299ee49
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 34 deletions.
Binary file modified resource/translations/en/LC_MESSAGES/skosmos.mo
Binary file not shown.
Binary file modified resource/translations/fi/LC_MESSAGES/skosmos.mo
Binary file not shown.
4 changes: 2 additions & 2 deletions resource/translations/skosmos_en.po
Original file line number Diff line number Diff line change
Expand Up @@ -825,5 +825,5 @@ msgstr "Search options tab"
msgid "Search results"
msgstr "Search results"

msgid "Sidebar listing: assort and traverse vocabulary contents by a criteria"
msgstr "Sidebar listing: assort and traverse vocabulary contents by a criteria"
msgid "Sidebar listing: list and traverse vocabulary contents by a criterion"
msgstr "Sidebar listing: list and traverse vocabulary contents by a criterion"
12 changes: 6 additions & 6 deletions resource/translations/skosmos_fi.po
Original file line number Diff line number Diff line change
Expand Up @@ -785,16 +785,16 @@ msgstr "Sanastot ja ontologiat"
msgid "Search from selected vocabularies"
msgstr "Hae valituista sanastoista"

msgid "Assort vocabulary concepts alphabetically"
msgid "List vocabulary concepts alphabetically"
msgstr "Listaa käsitteet aakkosittain"

msgid "Assort vocabulary concepts and groupings hierarchically"
msgid "List vocabulary concepts and groupings hierarchically"
msgstr "Listaa käsitteet ja ryhmät hierarkian mukaan"

msgid "Assort vocabulary concepts by newest additions"
msgid "List vocabulary concepts by newest additions"
msgstr "Listaa käsitteet uusimpien lisättyjen mukaan"

msgid "Assort vocabulary concepts hierarchically"
msgid "List vocabulary concepts hierarchically"
msgstr "Listaa käsitteet hierarkian mukaan"

msgid "Choose alphabetical listing letter"
Expand Down Expand Up @@ -824,5 +824,5 @@ msgstr "Hakuvalintojen välilehti"
msgid "Search results"
msgstr "Hakutulokset"

msgid "Sidebar listing: assort and traverse vocabulary contents by a criteria"
msgstr "Sivupalkin lista: lajittele ja selaa käsitteitä eri kriteerien mukaan"
msgid "Sidebar listing: list and traverse vocabulary contents by a criterion"
msgstr "Sivupalkin lista: listaa ja selaa käsitteitä eri kriteerien mukaan"
2 changes: 1 addition & 1 deletion resource/translations/skosmos_sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -822,5 +822,5 @@ msgstr "Flik för sökval"
msgid "Search results"
msgstr "Sökresultat"

msgid "Sidebar listing: assort and traverse vocabulary contents by a criteria"
msgid "Sidebar listing: list and traverse vocabulary contents by a criterion"
msgstr "Sidofältlista: ordna och bläddra begrepp efter kriterier"
Binary file modified resource/translations/sv/LC_MESSAGES/skosmos.mo
Binary file not shown.
10 changes: 5 additions & 5 deletions view/changes.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@

{% block sidebar %}
<div class="sidebar-buttons">
<h2 class="sr-only">{% trans "Sidebar listing: assort and traverse vocabulary contents by a criteria" %}</h2>
<h2 class="sr-only">{% trans "Sidebar listing: list and traverse vocabulary contents by a criterion" %}</h2>
<ul class="nav nav-tabs{% if vocab.config.showChangeList and vocab.config.groupClassURI %} nav-four-wide{% endif %}">
{% if request.vocab.config.showAlphabeticalIndex %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts alphabetically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts alphabetically" %}</h3>
<li id="alpha"><a href="{{ request.vocabid }}/{{ request.lang }}/index{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% if vocab.config.showChangeList and vocab.config.groupClassURI %}{% trans 'A-Z' %}{% else %}{% trans "Alpha-nav" %}{% endif %}</a></li>
{% endif %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
<li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}"{% if active_tab == 'hierarchy' %} class="active"{% endif %}><a href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
{% if vocab.config.groupClassURI %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts and groupings hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
<li id="groups"><a href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
{% endif %}
{% if vocab.config.showChangeList %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts by newest additions" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts by newest additions" %}</h3>
<li id="changes" class="active"><a href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-nav" %}</a></li>
{% endif %}
</ul>
Expand Down
10 changes: 5 additions & 5 deletions view/group-contents.twig
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@

{% block sidebar %}
<div class="sidebar-buttons">
<h2 class="sr-only">{% trans "Sidebar listing: assort and traverse vocabulary contents by a criteria" %}</h2>
<h2 class="sr-only">{% trans "Sidebar listing: list and traverse vocabulary contents by a criterion" %}</h2>
<ul class="nav nav-tabs{% if vocab.config.showChangeList and vocab.config.groupClassURI and vocab.config.showAlphabeticalIndex %} nav-four-wide{% endif %}">
{% if request.vocab.config.showAlphabeticalIndex %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts alphabetically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts alphabetically" %}</h3>
<li id="alpha"><a href="{{ request.vocabid }}/{{ request.lang }}/index{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% if vocab.config.showChangeList and vocab.config.groupClassURI %}{% trans 'A-Z' %}{% else %}{% trans "Alpha-nav" %}{% endif %}</a></li>
{% endif %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
<li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}"><a href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
{% if vocab.config.groupClassURI %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts and groupings hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
<li id="groups"{% if search_results|first.isGroup %} class="active"{% endif %}><a href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
{% endif %}
{% if vocab.config.showChangeList %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts by newest additions" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts by newest additions" %}</h3>
<li id="changes"><a href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-nav" %}</a></li>
{% endif %}
</ul>
Expand Down
10 changes: 5 additions & 5 deletions view/group-index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

{% block sidebar %}
<div class="sidebar-buttons">
<h2 class="sr-only">{% trans "Sidebar listing: assort and traverse vocabulary contents by a criteria" %}</h2>
<h2 class="sr-only">{% trans "Sidebar listing: list and traverse vocabulary contents by a criterion" %}</h2>
<ul class="nav nav-tabs{% if vocab.config.showChangeList and vocab.config.groupClassURI and vocab.config.showAlphabeticalIndex %} nav-four-wide{% endif %}">
{% if request.vocab.config.showAlphabeticalIndex %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts alphabetically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts alphabetically" %}</h3>
<li id="alpha"><a href="{{ request.vocabid }}/{{ request.lang }}/index{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% if vocab.config.showChangeList and vocab.config.groupClassURI %}{% trans 'A-Z' %}{% else %}{% trans "Alpha-nav" %}{% endif %}</a></li>
{% endif %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
<li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}"><a href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
{% if vocab.config.groupClassURI %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts and groupings hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
<li id="groups" class="active"><a href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
{% endif %}
{% if vocab.config.showChangeList %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts by newest additions" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts by newest additions" %}</h3>
<li id="changes"><a href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-nav" %}</a></li>
{% endif %}
</ul>
Expand Down
10 changes: 5 additions & 5 deletions view/light.twig
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
<div id="sidebar">
{% block sidebar %}
<div class="sidebar-buttons">
{% set sidebarHeading = request.page != 'search' ? "Sidebar listing: assort and traverse vocabulary contents by a criterion" : "Sidebar listing: vocabulary search options" %}
{% set sidebarHeading = request.page != 'search' ? "Sidebar listing: list and traverse vocabulary contents by a criterion" : "Sidebar listing: vocabulary search options" %}
<h2 class="sr-only">{% trans sidebarHeading %}</h2>
<ul class="nav nav-tabs{% if vocab.config.showChangeList and vocab.config.groupClassURI and vocab.config.showAlphabeticalIndex %} nav-four-wide{% endif %}">
{% if request.page != 'search' %}
{% if request.vocab.config.showAlphabeticalIndex %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts alphabetically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts alphabetically" %}</h3>
<li id="alpha"{% if search_results|length != 1 or (term and search_results|length == 1) %} class ="active"{% endif %}><a href="{{ request.vocabid }}/{{ request.lang }}/index{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% if vocab.config.showChangeList and vocab.config.groupClassURI %}{% trans'A-Z'%}{% else %}{% trans "Alpha-nav" %}{% endif %}</a></li>
{% endif %}
{% set disabledHierarchy = not vocab.config.showHierarchy and not search_results|length == 1 %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
<li id="hierarchy
{%- if disabledHierarchy %}-disabled{% endif -%}
"
Expand All @@ -57,11 +57,11 @@
</a>
</li>
{% if vocab.config.groupClassURI %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts and groupings hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
<li id="groups"><a href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
{% endif %}
{% if vocab.config.showChangeList %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts by newest additions" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts by newest additions" %}</h3>
<li id="changes"><a href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-nav" %}</a></li>
{% endif %}
{% else %}
Expand Down
10 changes: 5 additions & 5 deletions view/vocab.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
{% block sidebar %}
{% if vocab.config.showAlphabeticalIndex or vocab.config.showChangeList or vocab.config.showTopHierarchy %}
<div class="sidebar-buttons">
<h2 class="sr-only">{% trans "Sidebar listing: assort and traverse vocabulary contents by a criteria" %}</h2>
<h2 class="sr-only">{% trans "Sidebar listing: list and traverse vocabulary contents by a criterion" %}</h2>
<ul class="nav nav-tabs{% if vocab.config.showChangeList and vocab.config.groupClassURI and vocab.config.showAlphabeticalIndex %} nav-four-wide{% endif %}">
{% if request.vocab.config.showAlphabeticalIndex %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts alphabetically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts alphabetically" %}</h3>
<li id="alpha"{% if active_tab == 'alphabetical' %} class="active"{% endif %}><a href="{{ request.vocabid }}/{{ request.lang }}/index{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% if vocab.config.showChangeList and vocab.config.groupClassURI %}{% trans 'A-Z' %}{% else %}{% trans "Alpha-nav" %}{% endif %}</a></li>
{% endif %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
<li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}"{% if active_tab == 'hierarchy' %} class="active"{% endif %}><a href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
{% if vocab.config.groupClassURI %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts and groupings hierarchically" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
<li id="groups"><a href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
{% endif %}
{% if vocab.config.showChangeList %}
<h3 class="sr-only">{% trans "Assort vocabulary concepts by newest additions" %}</h3>
<h3 class="sr-only">{% trans "List vocabulary concepts by newest additions" %}</h3>
<li id="changes"><a href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-nav" %}</a></li>
{% endif %}
</ul>
Expand Down

0 comments on commit 299ee49

Please sign in to comment.