From 725649b4fe8b77f2e59faaa9c439ae8de225d4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Thu, 7 Sep 2017 17:31:12 +0200 Subject: [PATCH] Bug 19274: Translatability: Fix new splitting problems related to database warnings The warnings about database problems introduce new translatability problems, mostly related to sentence splitting by html tags. To test: - Verify that text changes make sense - Apply patch, verify that messages properly. Note: To force display you might want to add '1 ||' to the related if statements, including line 134, e.g. [% IF 1 || has_ai_issues %] - Bonus test: Go through an translation cicle and verify that fragemts as mentioned in initial comment are gone. (Amended to fix tiny typo) Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall --- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 33 ++++++++++++------------ 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 11e390c..13357e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -1,3 +1,4 @@ +[% USE HtmlTags %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › About Koha @@ -139,40 +140,38 @@ [% IF has_ai_issues %]

Data problems

-

- Some of your tables have problems with their auto_increment values which may lead to data loss. You should not ignore this warning. - The problem is that InnoDB does not keep auto_increment across SQL server restarts (it is only set in memory). - So on server startup the auto_increment values are set to max(table.id)+1. -

-

- See the related wiki page to know how to avoid this problem. +

Some of your tables have problems with their auto_increment values which may lead to data loss.

+

You should not ignore this warning.

+

The problem is that InnoDB does not keep auto_increment across SQL server restarts (it is only set in memory). So on server startup the auto_increment values are set to max(table.id)+1.

+

To know how to avoid this problem see the related wiki page: + DBMS auto increment fix

Problems found

[% IF ai_patrons %]

Patrons

-

The following ids exist in both borrowers and deletedborrowers tables: - [% FOR p IN ai_patrons %][% p.borrowernumber %][% UNLESS loop.last %], [% END %][% END %]

+

The following ids exist in both tables [% "borrowers" | $HtmlTags tag="strong" %] and [% "deletedborrowers" | $HtmlTags tag="strong" %]:

+

[% FOR p IN ai_patrons %][% p.borrowernumber %][% UNLESS loop.last %], [% END %][% END %]

[% END %] [% IF ai_biblios %]

Biblios

-

The following ids exist in both biblio and deletedbiblio tables: - [% FOR b IN ai_biblios %][% b.biblionumber %][% UNLESS loop.last %], [% END %][% END %]

+

The following ids exist in both tables [% "biblio" | $HtmlTags tag="strong" %] and [% "deletedbiblio" | $HtmlTags tag="strong" %]:

+

[% FOR b IN ai_biblios %][% b.biblionumber %][% UNLESS loop.last %], [% END %][% END %]

[% END %] [% IF ai_items %]

Items

-

The following ids exist in both items and deleteditems tables: - [% FOR i IN ai_items %][% i.itemnumber %][% UNLESS loop.last %], [% END %][% END %]

+

The following ids exist in both tables [% "items" | $HtmlTags tag="strong" %] and [% "deleteditems" | $HtmlTags tag="strong" %]:

+

[% FOR i IN ai_items %][% i.itemnumber %][% UNLESS loop.last %], [% END %][% END %]

[% END %] [% IF ai_checkouts %]

Checkouts

-

The following ids exist in both issues and old_issues tables: - [% FOR c IN ai_checkouts %][% c.issue_id %][% UNLESS loop.last %], [% END %][% END %]

+

The following ids exist in both tables [% "issues" | $HtmlTags tag="strong" %] and [% "old_issues" | $HtmlTags tag="strong" %]:

+

[% FOR c IN ai_checkouts %][% c.issue_id %][% UNLESS loop.last %], [% END %][% END %]

[% END %] [% IF ai_holds %]

Holds

-

The following ids exist in both holds and old_reserves table: - [% FOR h IN ai_holds %][% h.reserve_id %][% UNLESS loop.last %], [% END %][% END %]

+

The following ids exist in both tables [% "holds" | $HtmlTags tag="strong" %] and [% "old_reserves" | $HtmlTags tag="strong" %]:

+

[% FOR h IN ai_holds %][% h.reserve_id %][% UNLESS loop.last %], [% END %][% END %]

[% END %]
[% END %] -- 2.10.2