From 9b84efdcd08d22fcf7cc0c39cc9b175736b2fb62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Fri, 9 Jul 2010 15:17:49 +0200 Subject: [PATCH] ' innerhalb von Strings escapen Conflicts: templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html templates/webpages/admin/create_standard_group_ask_master.html templates/webpages/admin/restore_dataset_master.html templates/webpages/admin/restore_dataset_start_footer_master.html templates/webpages/admin/restore_dataset_start_header_master.html templates/webpages/am/edit_warehouse_master.html templates/webpages/amcvar/display_cvar_config_form_master.html templates/webpages/common/search_history_master.html templates/webpages/dbupgrade/buchungsgruppen_header_master.html templates/webpages/dbupgrade/units_parts_master.html templates/webpages/dbupgrade/units_services_master.html templates/webpages/login/auth_db_unreachable_master.html templates/webpages/sepa/bank_transfer_add_master.html templates/webpages/sepa/bank_transfer_mark_as_closed_step1_master.html --- .../assistant_for_wrong_taxkeys_master.html | 2 +- .../admin/create_standard_group_ask_master.html | 6 +++--- .../webpages/admin/restore_dataset_master.html | 6 +++--- .../restore_dataset_start_footer_master.html | 4 ++-- .../restore_dataset_start_header_master.html | 2 +- templates/webpages/am/edit_warehouse_master.html | 2 +- .../amcvar/display_cvar_config_form_master.html | 16 ++++++++-------- .../webpages/common/search_history_master.html | 2 +- .../dbupgrade/buchungsgruppen_header_master.html | 12 ++++++------ .../webpages/dbupgrade/units_parts_master.html | 2 +- .../dbupgrade/units_services_master.html | 2 +- .../login/auth_db_unreachable_master.html | 2 +- .../webpages/sepa/bank_transfer_add_master.html | 2 +- ...ank_transfer_mark_as_closed_step1_master.html | 2 +- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html index c287a30c9..430f0fc8a 100644 --- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html +++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys_master.html @@ -33,7 +33,7 @@ [% 'You can correct this transaction by chosing the correct taxkeys from the drop down boxes and hitting the button "Fix transaction" afterwards.' | $T8 %] - [% 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don't match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %] + [%- 'It is possible that even after such a correction there is something wrong with this transaction (e.g. taxes that don\'t match the selected taxkey). Therefore you should re-run the general ledger analysis.' | $T8 %]

diff --git a/templates/webpages/admin/create_standard_group_ask_master.html b/templates/webpages/admin/create_standard_group_ask_master.html index fae84772d..d5f680f6e 100644 --- a/templates/webpages/admin/create_standard_group_ask_master.html +++ b/templates/webpages/admin/create_standard_group_ask_master.html @@ -9,7 +9,7 @@ [% 'Lx-Office has been switched to group-based access restrictions.' | $T8 %] - [% 'You have to create at least one group, grant it access to Lx-Office's functions and assign users to it.' | $T8 %] + [%- 'You have to create at least one group, grant it access to Lx-Office\'s functions and assign users to it.' | $T8 %] [% 'Otherwise all users will only have access to their own settings.' | $T8 %] @@ -17,9 +17,9 @@

- [% 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office's functions.' | $T8 %] + [%- 'During this user migration Lx-Office can create such a group for you and grant all users access to all of Lx-Office\'s functions.' | $T8 %] - [% 'This corresponds to Lx-Office's behavior prior to version 2.4.4.' | $T8 %] + [%- 'This corresponds to Lx-Office\'s behavior prior to version 2.4.4.' | $T8 %]

diff --git a/templates/webpages/admin/restore_dataset_master.html b/templates/webpages/admin/restore_dataset_master.html index c37f89828..ab7a94bca 100644 --- a/templates/webpages/admin/restore_dataset_master.html +++ b/templates/webpages/admin/restore_dataset_master.html @@ -18,9 +18,9 @@

- [% 'The backup you upload here has to be a file created with "pg_dump -o -Ft".' | $T8 %] - [% 'It may optionally be compressed with "gzip".' | $T8 %] - [% 'Files created by Lx-Office's "Backup Dataset" function are such files.' | $T8 %] + [%- 'The backup you upload here has to be a file created with "pg_dump -o -Ft".' | $T8 %] + [%- 'It may optionally be compressed with "gzip".' | $T8 %] + [%- 'Files created by Lx-Office\'s "Backup Dataset" function are such files.' | $T8 %]

diff --git a/templates/webpages/admin/restore_dataset_start_footer_master.html b/templates/webpages/admin/restore_dataset_start_footer_master.html index 1c3a90763..c61a55e53 100644 --- a/templates/webpages/admin/restore_dataset_start_footer_master.html +++ b/templates/webpages/admin/restore_dataset_start_footer_master.html @@ -5,8 +5,8 @@

- [% 'The restoration process is complete. Please review "pg_restore"'s output to find out if the restoration was successful.' | $T8 %] - [% LxERP.t8("The programs exit code was #1 ("0" usually means that everything went OK).", retval) | html %] + [%- 'The restoration process is complete. Please review "pg_restore"\'s output to find out if the restoration was successful.' | $T8 %] + [%- 'The program\'s exit code was [% HTML.escape(retval) %] ("0" usually means that everything went OK).' | $T8 %]

diff --git a/templates/webpages/admin/restore_dataset_start_header_master.html b/templates/webpages/admin/restore_dataset_start_header_master.html index 7ee292c91..ede5e7ccd 100644 --- a/templates/webpages/admin/restore_dataset_start_header_master.html +++ b/templates/webpages/admin/restore_dataset_start_header_master.html @@ -3,7 +3,7 @@

[% title %]

-

[% 'The restoration process has started. Here's the output of the "pg_restore" command:' | $T8 %]

+

[%- 'The restoration process has started. Here\'s the output of the "pg_restore" command:' | $T8 %]

diff --git a/templates/webpages/am/edit_warehouse_master.html b/templates/webpages/am/edit_warehouse_master.html index a9d4d3baf..a90bc4ddb 100644 --- a/templates/webpages/am/edit_warehouse_master.html +++ b/templates/webpages/am/edit_warehouse_master.html @@ -60,7 +60,7 @@ [% ELSE %]

- [% 'Bins that have been used in the past cannot be deleted anymore. For these bins there's no checkbox in the "Delete" column.' | $T8 %] + [%- 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the "Delete" column.' | $T8 %]

diff --git a/templates/webpages/amcvar/display_cvar_config_form_master.html b/templates/webpages/amcvar/display_cvar_config_form_master.html index 6851e24fe..104b46fcd 100644 --- a/templates/webpages/amcvar/display_cvar_config_form_master.html +++ b/templates/webpages/amcvar/display_cvar_config_form_master.html @@ -115,9 +115,9 @@ (3) [% 'The default value depends on the variable type:' | $T8 %]

@@ -125,10 +125,10 @@ (4) [% 'The available options depend on the varibale type:' | $T8 %]

[% 'Other values are ignored.' | $T8 %] @@ -138,7 +138,7 @@

(5) - [% 'A variable marked as 'editable' can be changed in each quotation, order, invoice etc.' | $T8 %] + [%- 'A variable marked as \'editable\' can be changed in each quotation, order, invoice etc.' | $T8 %] [% 'Otherwise the variable is only available for printing.' | $T8 %]

diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html index 6e15e9ef1..0b2846985 100644 --- a/templates/webpages/common/search_history_master.html +++ b/templates/webpages/common/search_history_master.html @@ -95,7 +95,7 @@ } else { defaults.splice(remove,1); - document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("[% 'You've already chosen the following limitations:' | $T8 %]
") : ("
")) + translated[last]; + document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("[%- 'You\'ve already chosen the following limitations:' | $T8 %]
") : ("
")) + translated[last]; if(defaults.length > 0) { document.getElementById('einschraenkungen').value += ((document.getElementById('einschraenkungen').value == "") ? ("") : (",")) + last; tempString = "