use i18n for most strings

lektura
max.mehl 2018-06-08 18:22:10 +02:00
parent 1a71b27892
commit 8ce081cd8e
No known key found for this signature in database
GPG Key ID: 2704E4AB371E2E92
21 changed files with 89 additions and 134 deletions

View File

@ -5,43 +5,22 @@
{{ partial "head.html" . }}
</head>
<body id="page-top">
{{ if or .Site.Params.navigation.links.about .Site.Params.navigation.links.reasons .Site.Params.navigation.links.resources .Site.Params.navigation.links.contact }}
{{ partial "nav.html" . }}
{{ end }}
{{ if .Site.Params.start }}
{{ partial "start.html" . }}
{{ end }}
{{ partial "nav.html" . }}
{{ if .Site.Params.about }}
{{ partial "about.html" . }}
{{ end }}
{{ partial "start.html" . }}
{{ if .Site.Params.arguments.list }}
{{ partial "arguments.html" . }}
{{ end }}
{{ partial "about.html" . }}
{{ if .Site.Params.action }}
{{ partial "action.html" . }}
{{ end }}
{{ partial "arguments.html" . }}
{{ if .Site.Params.organisations }}
{{ partial "organisations.html" . }}
{{ end }}
{{ partial "action.html" . }}
<!-- Can be used later
{{ if .Site.Params.resources }}
{{ partial "resources.html" . }}
{{ end }}
-->
{{ partial "organisations.html" . }}
{{ if .Site.Params.spread }}
{{ partial "spread.html" . }}
{{ end }}
{{ partial "spread.html" . }}
{{ if .Site.Params.language }}
{{ partial "language.html" . }}
{{ end }}
{{ partial "language.html" . }}
{{ partial "legal.html" . }}

View File

@ -2,10 +2,10 @@
<header>
<div class="header-content">
<div class="header-content-inner">
<h1>{{ .Site.Params.error.headline }}</h1>
<h1>{{ i18n "error_headline" }}</h1>
<hr>
<p>{{ .Site.Params.error.description }}</p>
<a href="/" class="btn btn-primary btn-xl page-scroll">{{ .Site.Params.error.button }}</a>
<p>{{ i18n "error_description" }}</p>
<a href="/" class="btn btn-primary btn-xl page-scroll">{{ i18n "error_button" }}</a>
</div>
</div>
</header>

View File

@ -3,23 +3,16 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
{{ with .Site.Params.about.headline }}
<h2 class="section-heading">{{ . }}</h2>
{{ end }}
{{ if and .Site.Params.about.headline .Site.Params.about.description }}
<hr class="light">
{{ end }}
<h2 class="section-heading">{{ i18n "about_headline" }}</h2>
<hr class="light">
<!-- VIDEO -->
{{ partial "functions/video_fsfe.html" . }}
<!-- /VIDEO -->
{{ with .Site.Params.about.description }}
<p class="text-faded">{{ . | markdownify }}</p>
{{ end }}
{{ with .Site.Params.about.buttonText }}
<a href="#arguments" class="btn btn-default btn-xl page-scroll">{{ . }}</a>
{{ end }}
<a href="#arguments" class="btn btn-default btn-xl page-scroll">{{ i18n "about_buttonText" }}</a>
</div>
</div>
</div>

View File

@ -1,4 +1,4 @@
{{ "<!-- ACTION BOX -->" | safeHTML }}
<a href="#action" id="action-box" class="hiddenlink page-scroll wow bounceInDown" data-wow-delay="1s">
{{ replace .Site.Params.action.box.text "$INDS" (partial "functions/count_signatures.html" .) | markdownify }}
{{ replace (i18n "action_box_text") "$INDS" (partial "functions/count_signatures.html" .) | markdownify }}
</a>

View File

@ -3,11 +3,11 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">{{ .Site.Params.action.headline }}</h2>
<h2 class="section-heading">{{ i18n "action_headline" }}</h2>
<hr class="light">
<p id="actionintro">{{ .Site.Params.action.intro | markdownify }}</p>
<p><strong>{{ .Site.Params.action.demand | markdownify }}</strong></p>
<p>{{ (replace (replace .Site.Params.action.description "$ORGS" (partial "functions/count_organisations.html" .) ) "$INDS" (partial "functions/count_signatures.html" .)) | markdownify }}</p>
<p id="actionintro">{{ i18n "action_intro" | markdownify }}</p>
<p><strong>{{ i18n "action_demand" | markdownify }}</strong></p>
<p>{{ (replace (replace (i18n "action_description") "$ORGS" (partial "functions/count_organisations.html" .) ) "$INDS" (partial "functions/count_signatures.html" .)) | markdownify }}</p>
{{ partial "functions/sign-form.html" . }}
</div>

View File

@ -3,7 +3,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">{{ .Site.Params.arguments.headline }}</h2>
<h2 class="section-heading">{{ i18n "arguments_headline" }}</h2>
<hr class="primary">
</div>
</div>
@ -22,10 +22,10 @@
</div>
{{ end }}
</div>
<div class="definition blue"><p>{{ .Site.Params.fsdefinition }}</p></div>
<div class="definition blue"><p>{{ i18n "fsdefinition" }}</p></div>
<div class="col-lg-8 col-lg-offset-2 text-center" id="arguments-followup">
<p>{{ .Site.Params.arguments.followup | markdownify }}</p>
<a href="#action" class="btn btn-primary btn-xl page-scroll">{{ .Site.Params.arguments.buttonText }}</a>
<p>{{ i18n "arguments_followup" | markdownify }}</p>
<a href="#action" class="btn btn-primary btn-xl page-scroll">{{ i18n "arguments_buttonText" }}</a>
</div>
</div>
</section>

View File

@ -1,15 +1,15 @@
<form action="https://forms.fsfe.org/email" method="post">
<input name="appid" type="hidden" value="pmpc-sign" />
<label class="sign-input form-na">
<input name="name" placeholder="{{ .Site.Params.action.form.name }}" type="text" required />
<input name="name" placeholder="{{ i18n "action_form_name" }}" type="text" required />
</label>
<label class="sign-input form-em">
<input name="confirm" placeholder="{{ .Site.Params.action.form.email }}" type="email" required />
<input name="confirm" placeholder="{{ i18n "action_form_email" }}" type="email" required />
</label>
<br />
<label class="sign-input form-cn">
<select name="country">
<option value="">{{ .Site.Params.action.form.country }}</option>
<option value="">{{ i18n "action_form_country" }}</option>
{{ $json := getJSON "data/countries/countries.json" }}
{{ range sort $json "name" "asc" }}
<option value="{{ .name }}">{{ .name }}</option>
@ -17,25 +17,25 @@
</select>
</label>
<label class="sign-input form-zp">
<input name="zip" placeholder="{{ .Site.Params.action.form.zip }}" type="text" />
<input name="zip" placeholder="{{ i18n "action_form_zip" }}" type="text" />
</label>
<label class="sign-input form-co">
<input name="comment" placeholder="{{ .Site.Params.action.form.comment }}" type="text" maxlength="140" />
<input name="comment" placeholder="{{ i18n "action_form_comment" }}" type="text" maxlength="140" />
</label>
<div class="form-pe">
<div>
<label class="form-pe" for="permissionPriv">
<input name="permissionPriv" id="permissionPriv" value="yes" type="checkbox" required /> {{ replace .Site.Params.action.form.permPriv "privacy/" ("/privacy" | relLangURL) | markdownify }}
<input name="permissionPriv" id="permissionPriv" value="yes" type="checkbox" required /> {{ replace (i18n "action_form_permPriv") "privacy/" ("/privacy" | relLangURL) | markdownify }}
</label>
</div>
<div>
<label class="form-pe" for="permissionPub">
<input name="permissionPub" id="permissionPub" value="yes" type="checkbox" /> {{ replace .Site.Params.action.form.permPub "openletter/all-signatures" ("/openletter/all-signatures" | relLangURL) | markdownify}}
<input name="permissionPub" id="permissionPub" value="yes" type="checkbox" /> {{ replace (i18n "action_form_permPub") "openletter/all-signatures" ("/openletter/all-signatures" | relLangURL) | markdownify}}
</label>
</div>
<div>
<label class="form-pe" for="permissionNews">
<input name="permissionNews" id="permissionNews" value="yes" type="checkbox" /> {{ .Site.Params.action.form.permNews | markdownify }}
<input name="permissionNews" id="permissionNews" value="yes" type="checkbox" /> {{ i18n "action_form_permNews" | markdownify }}
</label>
</div>
</div>
@ -45,5 +45,5 @@
<input name="url" type="text" />
</label>
<br />
<button name="action" value="sign" type="submit" class="btn btn-default btn-xl">{{ .Site.Params.action.form.submit }}</button>
<button name="action" value="sign" type="submit" class="btn btn-default btn-xl">{{ i18n "action_form_submit" }}</button>
</form>

View File

@ -3,7 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
{{ with .Site.Params.static.meta.author }}<meta name="author" content="{{ . }}">{{ end }}
{{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
<meta name="description" content="{{ i18n "description" }}">
<meta name="keywords" content="Public Money, Public Code, #publiccode, campaign, Free Software, Open Source, FOSS, FLOSS, public administration, FOI, open letter, petition, PMPC">
{{ .Hugo.Generator }}
<title>{{ with .Params.Title }}{{ . }} - {{ end }}{{ .Site.Title }}</title>
@ -17,7 +17,7 @@
<meta property="og:title" content="{{ .Site.Title }}"/>
<meta property="og:url" content="{{ .Site.Params.static.url }}{{ "/" | relLangURL }}"/>
<meta property="og:image" content="{{ .Site.Params.static.url }}/{{ .Site.Params.static.meta.previewImage }}"/>
<meta property="og:description" content="{{ .Site.Params.description }}"/>
<meta property="og:description" content="{{ i18n "description" }}"/>
<meta property="og:locale" content="{{ .Lang }}"/>
{{ range .Translations }}
<meta property="og:locale:alternate" content="{{.Lang }}"/>{{ end }}
@ -26,7 +26,7 @@
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="{{ .Site.Params.static.meta.twitterUser }}"/>
<meta name="twitter:title" content="{{ .Site.Title }}"/>
<meta name="twitter:description" content="{{ .Site.Params.description }}"/>
<meta name="twitter:description" content="{{ i18n "description" }}"/>
<meta name="twitter:image" content="{{ .Site.Params.static.url }}/{{ .Site.Params.static.meta.previewImage }}"/>
<meta name="twitter:url" content="{{ .Site.Params.static.url }}{{ "/" | relLangURL }}"/>
<meta name="twitter:creator" content="{{ .Site.Params.static.meta.twitterUser }}"/>

View File

@ -3,8 +3,7 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="hidden">{{ .Site.Params.navigation.links.language }}</h2>
<p>{{ .Site.Params.language.description }}:</p>
<p>{{ i18n "language_description" }}:</p>
<p style="font-size:25px;"><i class="fa fa-globe" aria-hidden="true" style="font-size:1.5em;vertical-align:top;"></i></p>
<ul>
<li>{{ .Site.Params.languageName }}</li>

View File

@ -2,13 +2,13 @@
<section id="legal">
<div class="text-center">
<h2 class="hidden">Legal Information</h2>
<p>{{ .Site.Params.legal.contribute1 }} <a href="https://git.fsfe.org/pmpc/website" target="_blank">{{ .Site.Params.legal.contribute2 }}</a></p>
<p>{{ .Site.Params.legal.by }} (<a href="https://fsfe.org/index.{{ .Lang }}.html" target="_blank">FSFE</a>)
<a href="https://fsfe.org/about/legal/imprint.{{ .Lang }}.html" target="_blank">{{ .Site.Params.legal.imprint }}</a>
| <a href="{{ "privacy/" | relLangURL }}">{{ .Site.Params.legal.privacy }}</a>
| <a href="https://fsfe.org/about/transparency-commitment.{{ .Lang }}.html" target="_blank">{{ .Site.Params.legal.transparency }}</a>
<p>{{ i18n "legal_contribute1" }} <a href="https://git.fsfe.org/pmpc/website" target="_blank">{{ i18n "legal_contribute2" }}</a></p>
<p>{{ i18n "legal_by" }} (<a href="https://fsfe.org/index.{{ .Lang }}.html" target="_blank">FSFE</a>)
<a href="https://fsfe.org/about/legal/imprint.{{ .Lang }}.html" target="_blank">{{ i18n "legal_imprint" }}</a>
| <a href="{{ "privacy/" | relLangURL }}">{{ i18n "legal_privacy" }}</a>
| <a href="https://fsfe.org/about/transparency-commitment.{{ .Lang }}.html" target="_blank">{{ i18n "legal_transparency" }}</a>
Copyright &copy; {{ (now).Year }}</p>
<p>{{ .Site.Params.legal.license | markdownify }}</p>
<p>{{ i18n "legal_license" | markdownify }}</p>
</div>
</section>

View File

@ -26,16 +26,16 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a class="page-scroll" href="#about">{{ .Site.Params.navigation.links.about }}</a>
<a class="page-scroll" href="#about">{{ i18n "navigation_links_about" }}</a>
</li>
<li>
<a class="page-scroll" href="#arguments">{{ .Site.Params.navigation.links.arguments }}</a>
<a class="page-scroll" href="#arguments">{{ i18n "navigation_links_arguments" }}</a>
</li>
<li>
<a class="page-scroll" href="#action">{{ .Site.Params.navigation.links.action }}</a>
<a class="page-scroll" href="#action">{{ i18n "navigation_links_action" }}</a>
</li>
<li>
<a class="page-scroll" href="#spread">{{ .Site.Params.navigation.links.spread }}</a>
<a class="page-scroll" href="#spread">{{ i18n "navigation_links_spread" }}</a>
</li>
<li>
<a class="page-scroll" href="#language" title="Change Language"><i class="fa fa-globe" aria-hidden="true" style="font-size:1.5em;vertical-align:top;"></i> {{ .Site.Params.static.language }}</a>

View File

@ -2,10 +2,10 @@
<section id="organisations">
<div class="container">
<div class="text-center">
<h2 class="section-heading">{{ .Site.Params.organisations.headline }}</h2>
<h2 class="section-heading">{{ i18n "organisations_headline" }}</h2>
<hr />
<!-- replace the URL defined in config.toml because this snipped is used in sub-pages too -->
<p>{{ replace .Site.Params.organisations.text "openletter/" ("/openletter" | relLangURL) | markdownify }}</p>
<p>{{ replace (i18n "organisations_text") "openletter/" ("/openletter" | relLangURL) | markdownify }}</p>
<div class="radio-filter-orgs">
<label>
<input name="filter_orgs" type="radio" onclick="showAllOrgs()" checked><span class="label-text">{{ i18n "organisations_all" }}</span></input> </label>

View File

@ -2,7 +2,7 @@
{{ $data := index .Site.Data .Site.Language.Lang }}
<section class="no-padding" id="resources">
<div class="container-fluid">
<h2 class="hidden">{{ .Site.Params.navigation.links.resources }}</h2>
<h2 class="hidden">{{ i18n "navigation_links_resources" }}</h2>
<div class="row no-gutter">
{{ range .Site.Params.resources.list }}
<div class="col-lg-4 col-sm-6">

View File

@ -2,6 +2,6 @@
<div class="sharecolumn">
{{ $data := index .Site.Data.share .Site.Language.Lang }}
{{ partial "functions/share_buttons.html" (dict "type" "side" "defaultSocialText" .Site.Params.spread.defaultSocialText "url" .Site.Params.static.url "lang" ("/" | relLangURL) "data" $data) }}
{{ partial "functions/share_buttons.html" (dict "type" "side" "defaultSocialText" (i18n "spread_defaultSocialText") "url" .Site.Params.static.url "lang" ("/" | relLangURL) "data" $data) }}
</div>

View File

@ -3,23 +3,16 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
{{ with .Site.Params.spread.headline }}
<h2 class="section-heading">{{ . }}</h2>
{{ end }}
{{ with .Site.Params.spread.promoText }}
<p class="text-faded">{{ . | markdownify }}</p>
{{ end }}
<a href="{{ .Site.Params.static.promoLink }}" class="btn btn-default btn-xl page-scroll wow tada">{{ .Site.Params.spread.promoButtonText }}</a>
<h2 class="section-heading">{{ i18n "spread_headline" }}</h2>
<p class="text-faded">{{ i18n "spread_promoText" | markdownify }}</p>
<a href="{{ .Site.Params.static.promoLink }}" class="btn btn-default btn-xl page-scroll wow tada">{{ i18n "spread_promoButtonText" }}</a>
<hr class="light">
{{ with .Site.Params.spread.shareText }}
<p class="text-faded">{{ . | markdownify }}</p>
{{ end }}
<p class="text-faded">{{ i18n "spread_shareText" | markdownify }}</p>
<div class="share-buttons">
{{ .Site.Params.spread.shareTitle }}
{{ $data := index .Site.Data.share .Site.Language.Lang }}
{{ partial "functions/share_buttons.html" (dict "type" "spread" "defaultSocialText" .Site.Params.spread.defaultSocialText "url" .Site.Params.static.url "lang" ("/" | relLangURL) "data" $data) }}
{{ partial "functions/share_buttons.html" (dict "type" "spread" "defaultSocialText" (i18n "spread_defaultSocialText") "url" .Site.Params.static.url "lang" ("/" | relLangURL) "data" $data) }}
</div>
</div>
</div>

View File

@ -8,20 +8,14 @@
<span class="logo-blue">{{ .Site.Params.static.slogan_1 }}</span>
<span class="logo-green">{{ .Site.Params.static.slogan_2 }}</span>
</h1>
{{ with .Site.Params.start.fsfe }}<h2 id="start">{{ . }}</h2>{{ end }}
</div>
{{ if and .Site.Params.static.slogan_1 .Site.Params.start.subtitle1 }}
<hr />
{{ end }}
<p>{{ with .Site.Params.start.subtitle1 }}{{ . | markdownify }}{{ end }}
<hr />
<p>{{ i18n "start_subtitle1" | markdownify }}
<br /><br />
{{ with .Site.Params.start.subtitle2 }}{{ . | markdownify }}{{ end }}
{{ i18n "start_subtitle2" | markdownify }}
<br /><br />
{{ with .Site.Params.start.subtitle3 }}{{ . | markdownify }}{{ end }}</p>
{{ with .Site.Params.start.buttonText }}
<!--<a href="#about" class="btn btn-primary btn-xl page-scroll">{{ . }}</a>-->
{{ end }}
{{ i18n "start_subtitle3" | markdownify }}</p>
<div class="arrow-bounce">
<a class="fa fa-chevron-down fa-3x hiddenlink page-scroll" href="#about"></a>
</div>

View File

@ -3,7 +3,7 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">{{ .Site.Params.action.headline }}</h2>
<h2 class="section-heading">{{ i18n "action_headline" }}</h2>
<hr class="light">
{{ partial "functions/sign-form.html" . }}

View File

@ -25,19 +25,19 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{{ "/" | relLangURL }}">{{ .Site.Params.navigation.links.start }}</a>
<a href="{{ "/" | relLangURL }}">{{ i18n "navigation_links_start" }}</a>
</li>
<li>
<a href="{{ "/#about" | relLangURL }}">{{ .Site.Params.navigation.links.about }}</a>
<a href="{{ "/#about" | relLangURL }}">{{ i18n "navigation_links_about" }}</a>
</li>
<li>
<a href="{{ "/#arguments" | relLangURL }}">{{ .Site.Params.navigation.links.arguments }}</a>
<a href="{{ "/#arguments" | relLangURL }}">{{ i18n "navigation_links_arguments" }}</a>
</li>
<li>
<a href="{{ "/#action" | relLangURL }}">{{ .Site.Params.navigation.links.action }}</a>
<a href="{{ "/#action" | relLangURL }}">{{ i18n "navigation_links_action" }}</a>
</li>
<li>
<a href="{{ "/#spread" | relLangURL }}">{{ .Site.Params.navigation.links.spread }}</a>
<a href="{{ "/#spread" | relLangURL }}">{{ i18n "navigation_links_spread" }}</a>
</li>
<li>
<a class="page-scroll" href="#language" title="Change Language"><i class="fa fa-globe" aria-hidden="true" style="font-size:1.5em;vertical-align:top;"></i> {{ .Site.Params.static.language }}</a>

View File

@ -3,23 +3,20 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
{{ with .Site.Params.subpage.signatures.headline }}
<h2 class="section-heading">{{ . }}</h2>
{{ end }}
{{ if and .Site.Params.subpage.signatures.headline .Site.Params.subpage.signatures.description }}
<hr class="light">
{{ end }}
<h2 class="section-heading">{{ i18n "subpage_signatures_headline" }}</h2>
<p class="text-faded">{{ .Site.Params.subpage.signatures.description | markdownify }}
<a href="{{ "#action" | relLangURL }}"><strong>{{ .Site.Params.action.form.Submit }}</strong></a></p>
<hr class="light">
<p class="text-faded">{{ i18n "subpage_signatures_description" | markdownify }}
<a href="{{ "#action" | relLangURL }}"><strong>{{ i18n "action_form_submit" }}</strong></a></p>
<!-- If you change something here, also change layouts/shortcodes/show_signature.html -->
<table id="sigtable">
<thead>
<tr>
<th>{{ .Site.Params.subpage.signatures.tableName }}</th>
<th>{{ .Site.Params.subpage.signatures.tableCountry }}</th>
<th>{{ .Site.Params.subpage.signatures.tableComment }}</th>
<th>{{ i18n "subpage_signatures_tableName" }}</th>
<th>{{ i18n "subpage_signatures_tableCountry" }}</th>
<th>{{ i18n "subpage_signatures_tableComment" }}</th>
</tr>
</thead>
<tbody>
@ -36,7 +33,7 @@
</tbody>
</table>
<p class="text-faded">{{ .Site.Params.subpage.signatures.allSignatures | markdownify }}</p>
<p class="text-faded">{{ i18n "subpage_signatures_allSignatures" | markdownify }}</p>
</div>
</div>
</div>

View File

@ -1,7 +1,7 @@
{{ if eq (.Get "type") "box" }}
<div class="definition"><p>{{ .Site.Params.fsdefinition }}</p></div>
<div class="definition"><p>{{ i18n "fsdefinition" }}</p></div>
{{ else if eq (.Get "type") "paragraph" }}
<p>{{ .Site.Params.fsdefinition }}</p>
<p>{{ i18n "fsdefinition" }}</p>
{{ else }}
{{ .Site.Params.fsdefinition }}
{{ i18n "fsdefinition" }}
{{ end }}

View File

@ -2,9 +2,9 @@
<table id="sigtable">
<thead>
<tr>
<th>{{ .Site.Params.subpage.signatures.tableName }}</th>
<th>{{ .Site.Params.subpage.signatures.tableCountry }}</th>
<th>{{ .Site.Params.subpage.signatures.tableComment }}</th>
<th>{{ i18n "subpage_signatures_tableName" }}</th>
<th>{{ i18n "subpage_signatures_tableCountry" }}</th>
<th>{{ i18n "subpage_signatures_tableComment" }}</th>
</tr>
</thead>
<tbody>