From b40e0719429f6b8ea787ec8498bf93bbde4539ba Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 21:17:37 +0200
Subject: [PATCH 1/3] Remove colons from form field labels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Different languages have different typographic conventions. For that
reason, it does not make sense to include colons in the templates –
instead the translators should decide what is the usual way form
fields are designated and use it.
---
 templates/home.phtml          | 4 ++--
 templates/source.phtml        | 8 ++++----
 templates/source_params.phtml | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/home.phtml b/templates/home.phtml
index 8c0bf9b69d..4677d876a8 100644
--- a/templates/home.phtml
+++ b/templates/home.phtml
@@ -93,8 +93,8 @@
         <form action="<?= $this->base; ?>" method="post">
         <ul id="login">
             <li><h1>selfoss login</h1></li>
-            <li><label for="username"><?= trim(\F3::get('lang_login_username')); ?>:</label> <input type="text" name="username" id="username"></li>
-            <li><label for="password"><?= trim(\F3::get('lang_login_password')); ?>:</label> <input type="password" name="password" id="password"></li>
+            <li><label for="username"><?= trim(\F3::get('lang_login_username')); ?></label> <input type="text" name="username" id="username"></li>
+            <li><label for="password"><?= trim(\F3::get('lang_login_password')); ?></label> <input type="password" name="password" id="password"></li>
             <li class="error"></li>
             <li class="button"><label>&nbsp;</label><input type="submit" value="<?= \F3::get('lang_login'); ?>" /></li>
         </ul>
diff --git a/templates/source.phtml b/templates/source.phtml
index 176945394c..eb2c53370b 100644
--- a/templates/source.phtml
+++ b/templates/source.phtml
@@ -42,19 +42,19 @@
     <!-- edit -->
     <ul class="source-edit-form">
         <!-- title -->
-        <li><label for="title-<?= $idAttr ?>"><?= \F3::get('lang_source_title')?>:</label> <input id="title-<?= $idAttr ?>" type="text" name="title" value="<?= isset($this->source) ? $this->source['title'] : ''; ?>" placeholder="<?= F3::get('lang_source_autotitle_hint'); ?>" /></li>
+        <li><label for="title-<?= $idAttr ?>"><?= \F3::get('lang_source_title')?></label> <input id="title-<?= $idAttr ?>" type="text" name="title" value="<?= isset($this->source) ? $this->source['title'] : ''; ?>" placeholder="<?= F3::get('lang_source_autotitle_hint'); ?>" /></li>
 
 
         <!-- tags -->
-        <li><label for="tags-<?= $idAttr ?>"><?= \F3::get('lang_source_tags'); ?>:</label>
+        <li><label for="tags-<?= $idAttr ?>"><?= \F3::get('lang_source_tags'); ?></label>
             <input id="tags-<?= $idAttr ?>" type="text" name="tags" value="<?= isset($this->source) ? $this->source['tags'] : ''; ?>" /> <span class="source-edit-form-help"> <?= \F3::get('lang_source_comma')?></span>
         </li>
 
         <!-- filter -->
-        <li><label for="filter-<?= $idAttr ?>"><?= \F3::get('lang_source_filter')?>:</label> <input id="filter-<?= $idAttr ?>" type="text" name="filter" value="<?= isset($this->source) ? $this->source['filter'] : ''; ?>" placeholder="<?= F3::get('lang_source_optional'); ?>" /></li>
+        <li><label for="filter-<?= $idAttr ?>"><?= \F3::get('lang_source_filter')?></label> <input id="filter-<?= $idAttr ?>" type="text" name="filter" value="<?= isset($this->source) ? $this->source['filter'] : ''; ?>" placeholder="<?= F3::get('lang_source_optional'); ?>" /></li>
 
         <!-- type -->
-        <li><label for="type-<?= $idAttr ?>"><?= \F3::get('lang_source_type')?>:</label>
+        <li><label for="type-<?= $idAttr ?>"><?= \F3::get('lang_source_type')?></label>
             <select id="type-<?= $idAttr ?>" class="source-spout" name="spout">
                 <option value=""><?= \F3::get('lang_source_select')?></option>
                 <?php foreach ($this->spouts as $spouttype => $spout) : ?>
diff --git a/templates/source_params.phtml b/templates/source_params.phtml
index 5418a70a50..3b508c1258 100644
--- a/templates/source_params.phtml
+++ b/templates/source_params.phtml
@@ -15,7 +15,7 @@ foreach ($this->spout->params as $spoutParamName => $spoutParam) {
         || $spoutParam['type'] == 'checkbox'
         || $spoutParam['type'] == 'url') {
         echo '<li>
-                <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . ':</label>
+                <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . '</label>
                 <input id="' . $spoutParamName . '-' . $this->idAttr . '" type="' . $spoutParam['type'] . '"
                        name="' . $spoutParamName . '"
                        value="' . $value . '"
@@ -26,13 +26,13 @@ foreach ($this->spout->params as $spoutParamName => $spoutParam) {
     if ($spoutParam['type'] == 'password') {
         if (empty($value)) {
             echo '<li>
-                    <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . ':</label>
+                    <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . '</label>
                     <input id="' . $spoutParamName . '-' . $this->idAttr . '" type="' . $spoutParam['type'] . '"
                            name="' . $spoutParamName . '" />
                   </li>';
         } else {
             echo '<li>
-                    <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . ':</label>
+                    <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . '</label>
                     <input id="' . $spoutParamName . '-' . $this->idAttr . '" type="' . $spoutParam['type'] . '"
                            name="' . $spoutParamName . '"
                            placeholder="' . \F3::get('lang_source_pwd_placeholder') . '" />
@@ -46,7 +46,7 @@ foreach ($this->spout->params as $spoutParamName => $spoutParam) {
         }
 
         echo '<li>
-                <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . ':</label>
+                <label for="' . $spoutParamName . '-' . $this->idAttr . '">' . $spoutParam['title'] . '</label>
                 <select id="' . $spoutParamName . '-' . $this->idAttr . '" name="' . $spoutParamName . '" size="1">' . $options . '
                 </select>
             </li>';

From d63e16ece07d59ccce8e60f7d9a7774c6c612171 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 21:37:05 +0200
Subject: [PATCH 2/3] i18n: allow translating invalid credentials error

---
 controllers/Index.php | 2 +-
 public/lang/cs.ini    | 1 +
 public/lang/en.ini    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/controllers/Index.php b/controllers/Index.php
index 2db0764881..2d9d7a348e 100644
--- a/controllers/Index.php
+++ b/controllers/Index.php
@@ -147,7 +147,7 @@ public function login() {
 
         $this->view->jsonSuccess([
             'success' => false,
-            'error' => 'invalid username/password'
+            'error' => \F3::get('lang_login_invalid_credentials'),
         ]);
     }
 
diff --git a/public/lang/cs.ini b/public/lang/cs.ini
index e3cc9764ad..70e201b90a 100644
--- a/public/lang/cs.ini
+++ b/public/lang/cs.ini
@@ -46,5 +46,6 @@ lang_more=více
 lang_login=přihlásit
 lang_login_username=jméno
 lang_login_password=heslo
+lang_login_invalid_credentials=špatné jméno nebo heslo
 lang_no_title=Bez titulku
 lang_error=nastala chyba
diff --git a/public/lang/en.ini b/public/lang/en.ini
index 86e4e18709..e973196a08 100644
--- a/public/lang/en.ini
+++ b/public/lang/en.ini
@@ -49,6 +49,7 @@ lang_more=more
 lang_login=login
 lang_login_username=username
 lang_login_password=password
+lang_login_invalid_credentials=invalid username/password
 lang_no_title=no title
 lang_error=an error occured
 lang_streamerror=No items loaded, reload?

From b8f51c11a7ed92eb4b88cbc983bbbc1a47103d23 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 21:44:11 +0200
Subject: [PATCH 3/3] l10n: update Czech translation

---
 public/lang/cs.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/lang/cs.ini b/public/lang/cs.ini
index 70e201b90a..fc50c246a7 100644
--- a/public/lang/cs.ini
+++ b/public/lang/cs.ini
@@ -9,6 +9,7 @@ lang_timestamp={0,date} {0,time}
 lang_hours=před {0,plural,one {1 hodinou},other {# hodinami}}
 lang_minutes=před {0,plural,one {1 minutou},other {# minutami}}
 lang_seconds=před {0,plural,one {chvílí},other {# sekundami}}
+lang_days={0,plural,zero {dnes},one {včera},other {před # dny}}
 lang_star=označit
 lang_unstar=odznačit
 lang_mark=označit jako přečtené
@@ -34,12 +35,14 @@ lang_source_new=nový neuložený zdroj
 lang_source_title=Název
 lang_source_autotitle_hint=Pro automatické vyplnění ponechte prázdné
 lang_source_tags=Štítky
+lang_source_pwd_placeholder=beze změny
 lang_source_comma=oddělené čárkou
 lang_source_select=vyberte prosím zdroj
 lang_source_type=Typ
 lang_source_save=uložit
 lang_source_cancel=zrušit
 lang_source_saved=uloženo
+lang_source_last_post=Poslední příspěvek spatřen
 lang_source_refresh=Obnovit tento zdroj
 lang_no_entries=žádný záznam
 lang_more=více
@@ -49,3 +52,4 @@ lang_login_password=heslo
 lang_login_invalid_credentials=špatné jméno nebo heslo
 lang_no_title=Bez titulku
 lang_error=nastala chyba
+lang_streamerror=Nenačteny žádné položky, zkusit znovu?