From f7588c06c79f6066eeb60d8fe29b995c2b8ce9b4 Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Tue, 8 Dec 2015 21:11:58 +0100 Subject: [PATCH] Bug 15304: Remove Norwegian strings from nl-search.tt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When nl-search.pl gets data from the Norwegian national patron database, it does so in an XML format that has Norwegian element names. nl-search.pl displays the data with the Noregian element names as labels. This means Norwegian words turn up in translations, which is messy. This patch replaces the Norwegian labels with English ones. To test: - Only Norwegian libraries and vendors get access to search against the national patron database, so a proper functional test is not possible - Alternative 1: Just have a look at the nl-search.tt template before and after the patch and verify that after the patch the Norwegian strings that would be visible to a user are gone - Alternative 2: - Verify that e.g. en-GB-staff-prog.po contains the Norwegian string "kjonn" - Apply the patch - Create new .po files with e.g. "./translate create en-GB" - Verify that "kjonn" is now gone from en-GB-staff-prog.po Version 2: Tweak a couple of labels to be more in line with labels used elsewhere in Koha, to avoid variants when translating. Version 3: Replace e.g. "Gender: " with "Gender: " to avoid similar-except-for-whitespace strings in translation. Signed-off-by: Bernardo Gonzalez Kriegel A few new strings, all previous removed. No koha-qa errors Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher (cherry picked from commit bd4a6830527b3d1482e41f084098de66eacf5bcd) Signed-off-by: Julian Maurice (cherry picked from commit 8314d1beb5cd38a0d9e8a1cbbca13be508727fd9) Signed-off-by: Frédéric Demians --- .../prog/en/modules/members/nl-search.tt | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt index b8a9791170..ae06764a21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt @@ -80,46 +80,46 @@

[% p.navn | html_entity %]

    -[% IF ( p.kjonn ) %]
  1. kjonn: [% p.kjonn | html_entity %]
    2. [% END %] -[% IF ( p.fdato ) %]
  2. fdato: [% p.fdato | html_entity %]
    3. [% END %] -[% IF ( p.lnr ) %]
  3. lnr: [% p.lnr | html_entity %]
    4. [% END %] -[% IF ( p.fnr_hash ) %]
  4. fnr_hash: [% p.fnr_hash | html_entity %]
    5. [% END %] - -[% IF ( p.epost ) %]
  5. epost: [% p.epost | html_entity %]
    6. [% END %] -[% IF ( p.epost_sjekk ) %]
  6. epost_sjekk: [% p.epost_sjekk | html_entity %]
    7. [% END %] - -[% IF ( p.tlf_mobil ) %]
  7. tlf_mobil: [% p.tlf_mobil | html_entity %]
    8. [% END %] -[% IF ( p.tlf_hjemme ) %]
  8. tlf_hjemme: [% p.tlf_hjemme | html_entity %]
    9. [% END %] -[% IF ( p.tlf_jobb ) %]
  9. tlf_jobb: [% p.tlf_jobb | html_entity %]
    10. [% END %] - -[% IF ( p.p_adresse1 ) %]
  10. p_adresse1: [% p.p_adresse1 | html_entity %]
    11. [% END %] -[% IF ( p.p_adresse2 ) %]
  11. p_adresse2: [% p.p_adresse2 | html_entity %]
    12. [% END %] -[% IF ( p.p_postnr ) %]
  12. p_postnr: [% p.p_postnr | html_entity %]
    13. [% END %] -[% IF ( p.p_sted ) %]
  13. p_sted: [% p.p_sted | html_entity %]
    14. [% END %] -[% IF ( p.p_land ) %]
  14. p_land: [% p.p_land | html_entity %]
    15. [% END %] -[% IF ( p.p_sjekk ) %]
  15. p_sjekk: [% p.p_sjekk | html_entity %]
    16. [% END %] - -[% IF ( p.m_adresse1 ) %]
  16. m_adresse1: [% p.m_adresse1 | html_entity %]
    17. [% END %] -[% IF ( p.m_adresse2 ) %]
  17. m_adresse2: [% p.m_adresse2 | html_entity %]
    18. [% END %] -[% IF ( p.m_postnr ) %]
  18. m_postnr: [% p.m_postnr | html_entity %]
    19. [% END %] -[% IF ( p.m_sted ) %]
  19. m_sted: [% p.m_sted | html_entity %]
    20. [% END %] -[% IF ( p.m_land ) %]
  20. m_land: [% p.m_land | html_entity %]
    21. [% END %] -[% IF ( p.m_sjek ) %]
  21. m_sjekk: [% p.m_sjekk | html_entity %]
    22. [% END %] -[% IF ( p.m_gyldig_til ) %]
  22. m_gyldig_til: [% p.m_gyldig_til | html_entity %]
    23. [% END %] - -[% IF ( p.pin ) %]
  23. pin: [% p.pin | html_entity %]
    24. [% END %] -[% IF ( p.passord ) %]
  24. passsord: [% p.passord | html_entity %]
    25. [% END %] -[% IF ( p.feide ) %]
  25. feide: [% p.feide | html_entity %]
    26. [% END %] -[% IF ( p.folkeregsjekk_dato ) %]
  26. folkeregsjekk_dato: [% p.folkeregsjekk_dato | html_entity %]
    27. [% END %] - -[% IF ( p.hjemmebibliotek ) %]
  27. hjemmebibliotek: [% p.hjemmebibliotek | html_entity %]
    28. [% END %] -[% IF ( p.opprettet ) %]
  28. opprettet: [% p.opprettet | html_entity %]
    29. [% END %] -[% IF ( p.opprettet_av ) %]
  29. opprettet_av: [% p.opprettet_av | html_entity %]
    30. [% END %] -[% IF ( p.sist_endret ) %]
  30. sist_endret: [% p.sist_endret | html_entity %]
    31. [% END %] -[% IF ( p.sist_endret_av ) %]
  31. sist_endret_av: [% p.sist_endret_av | html_entity %]
    32. [% END %] -[% IF ( p.gyldig_til ) %]
  32. gyldig_til: [% p.gyldig_til | html_entity %]
    33. [% END %] - -[% IF ( p.prim_kontakt ) %]
  33. prim_kontakt: [% p.prim_kontakt | html_entity %]
    34. [% END %] +[% IF ( p.kjonn ) %]
  34. Gender: [% p.kjonn | html_entity %]
    35. [% END %] +[% IF ( p.fdato ) %]
  35. Date of birth: [% p.fdato | html_entity %]
    36. [% END %] +[% IF ( p.lnr ) %]
  36. Card number: [% p.lnr | html_entity %]
    37. [% END %] +[% IF ( p.fnr_hash ) %]
  37. Social security number hash: [% p.fnr_hash | html_entity %]
    38. [% END %] + +[% IF ( p.epost ) %]
  38. Email: [% p.epost | html_entity %]
    39. [% END %] +[% IF ( p.epost_sjekk ) %]
  39. Email check: [% p.epost_sjekk | html_entity %]
    40. [% END %] + +[% IF ( p.tlf_mobil ) %]
  40. Phone - mobile: [% p.tlf_mobil | html_entity %]
    41. [% END %] +[% IF ( p.tlf_hjemme ) %]
  41. Phone - home: [% p.tlf_hjemme | html_entity %]
    42. [% END %] +[% IF ( p.tlf_jobb ) %]
  42. Phone - work: [% p.tlf_jobb | html_entity %]
    43. [% END %] + +[% IF ( p.p_adresse1 ) %]
  43. Address: [% p.p_adresse1 | html_entity %]
    44. [% END %] +[% IF ( p.p_adresse2 ) %]
  44. Address 2: [% p.p_adresse2 | html_entity %]
    45. [% END %] +[% IF ( p.p_postnr ) %]
  45. Zip/Postal code: [% p.p_postnr | html_entity %]
    46. [% END %] +[% IF ( p.p_sted ) %]
  46. City: [% p.p_sted | html_entity %]
    47. [% END %] +[% IF ( p.p_land ) %]
  47. Country: [% p.p_land | html_entity %]
    48. [% END %] +[% IF ( p.p_sjekk ) %]
  48. Check: [% p.p_sjekk | html_entity %]
    49. [% END %] + +[% IF ( p.m_adresse1 ) %]
  49. Address: [% p.m_adresse1 | html_entity %]
    50. [% END %] +[% IF ( p.m_adresse2 ) %]
  50. Address 2: [% p.m_adresse2 | html_entity %]
    51. [% END %] +[% IF ( p.m_postnr ) %]
  51. Zip/Postal code: [% p.m_postnr | html_entity %]
    52. [% END %] +[% IF ( p.m_sted ) %]
  52. City: [% p.m_sted | html_entity %]
    53. [% END %] +[% IF ( p.m_land ) %]
  53. Country: [% p.m_land | html_entity %]
    54. [% END %] +[% IF ( p.m_sjek ) %]
  54. Check: [% p.m_sjekk | html_entity %]
    55. [% END %] +[% IF ( p.m_gyldig_til ) %]
  55. Valid until: [% p.m_gyldig_til | html_entity %]
    56. [% END %] + +[% IF ( p.pin ) %]
  56. PIN: [% p.pin | html_entity %]
    57. [% END %] +[% IF ( p.passord ) %]
  57. Password: [% p.passord | html_entity %]
    58. [% END %] +[% IF ( p.feide ) %]
  58. FEIDE: [% p.feide | html_entity %]
    59. [% END %] +[% IF ( p.folkeregsjekk_dato ) %]
  59. Population registry date check: [% p.folkeregsjekk_dato | html_entity %]
    60. [% END %] + +[% IF ( p.hjemmebibliotek ) %]
  60. Home library: [% p.hjemmebibliotek | html_entity %]
    61. [% END %] +[% IF ( p.opprettet ) %]
  61. Created: [% p.opprettet | html_entity %]
    62. [% END %] +[% IF ( p.opprettet_av ) %]
  62. Created by: [% p.opprettet_av | html_entity %]
    63. [% END %] +[% IF ( p.sist_endret ) %]
  63. Last changed: [% p.sist_endret | html_entity %]
    64. [% END %] +[% IF ( p.sist_endret_av ) %]
  64. Last changed by: [% p.sist_endret_av | html_entity %]
    65. [% END %] +[% IF ( p.gyldig_til ) %]
  65. Valid until: [% p.gyldig_til | html_entity %]
    66. [% END %] + +[% IF ( p.prim_kontakt ) %]
  66. Primary contact: [% p.prim_kontakt | html_entity %]
    67. [% END %]
-- 2.39.5