From e54c6c68833d6a4a4c49b4f3740b147cbad7d6d3 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Fri, 27 Aug 2021 08:37:03 -1000
Subject: [PATCH] Bug 28914: Fix wording in authentication forms
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In most authentication forms we see :
Fields "Login:" and "Password:" with a submit button "Log in".

In some places submit button contains "Login", which is confusing for translation.
It is not correct according to terminology https://wiki.koha-community.org/wiki/Terminology#L
Also in opac-user.pl ":" is missing, it generates new translation entries.

Test plan:
1) Log out if you are logged in
2) Go to staff interface
3) Check you see button "Log in"
4) Go to OPAC page /cgi-bin/koha/opac-user.pl
5) Check you see fields "Login:" and "Password:"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b16f66abd1bc35a34f6ed0337f08ae87d6d8adbd)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt       | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 0baa814127..706ea15a50 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -112,7 +112,7 @@
 
     <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
-    <p class="submit"><input id="submit-button" type="submit" value="Login" tabindex="4" /></p>
+    <p class="submit"><input id="submit-button" type="submit" value="Log in" tabindex="4" /></p>
     </form>
 
     [% IF ( casAuthentication ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index 7204f407cf..2709ae127b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -181,11 +181,11 @@
                                         <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
                                     [% END %]
                                     <div class="form-group">
-                                        <label for="userid">Login</label>
+                                        <label for="userid">Login:</label>
                                         <input class="form-control" type="text"  size="25" id="userid"  name="userid" />
                                     </div>
                                     <div class="form-group">
-                                        <label for="password">Password</label>
+                                        <label for="password">Password:</label>
                                         <input class="form-control" type="password"  size="25" id="password"  name="password" />
                                     </div>
                                     <fieldset class="action">
-- 
2.39.5