Changeset:
a93f1be83329
https://sourceforge.net/p/mrbs/hg-code/ci/a93f1be8332947d3388dd32964b464c36e64428c
Author:
Campbell Morrison <cimorri...@hg.code.sf.net>
Date:
Fri Mar 10 15:58:23 2017 +0000
Log message:
Moved colons out of .js files and into lang files. (Can't very easily produce
colons using CSS content property because we're also using these strings in
the title attribute for a tooltip).
diffstat:
web/js/edit_entry.js.php | 6 +++---
web/lang/lang.en | 6 +++---
web/lang/lang.fr | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diffs (62 lines):
diff -r b3d5d069208d -r a93f1be83329 web/js/edit_entry.js.php
--- a/web/js/edit_entry.js.php Fri Mar 10 13:00:46 2017 +0000
+++ b/web/js/edit_entry.js.php Fri Mar 10 15:58:23 2017 +0000
@@ -611,7 +611,7 @@
{
conflictDiv.attr('class', 'bad');
detailsHTML = "<p>";
- titleText = '<?php echo
escape_js(mrbs_entity_decode(get_vocab("conflict"))) ?>' + ": \n\n";
+ titleText = '<?php echo
escape_js(mrbs_entity_decode(get_vocab("conflict"))) ?>' + "\n\n";
detailsHTML += titleText + "<\/p>";
var conflictsList = getErrorList(result.conflicts);
detailsHTML += conflictsList.html;
@@ -639,7 +639,7 @@
{
policyDiv.attr('class', 'notice');
detailsHTML = "<p>";
- titleText = '<?php echo
escape_js(mrbs_entity_decode(get_vocab("rules_broken_notices"))) ?>' + ":
\n\n";
+ titleText = '<?php echo
escape_js(mrbs_entity_decode(get_vocab("rules_broken_notices"))) ?>' + "\n\n";
detailsHTML += titleText + "<\/p>";
var rulesList = getErrorList(result.violations.notices);
detailsHTML += rulesList.html;
@@ -650,7 +650,7 @@
{
policyDiv.attr('class', 'bad');
detailsHTML = "<p>";
- titleText = '<?php echo
escape_js(mrbs_entity_decode(get_vocab("rules_broken"))) ?>' + ": \n\n";
+ titleText = '<?php echo
escape_js(mrbs_entity_decode(get_vocab("rules_broken"))) ?>' + "\n\n";
detailsHTML += titleText + "<\/p>";
var rulesList = getErrorList(result.violations.errors);
detailsHTML += rulesList.html;
diff -r b3d5d069208d -r a93f1be83329 web/lang/lang.en
--- a/web/lang/lang.en Fri Mar 10 13:00:46 2017 +0000
+++ b/web/lang/lang.en Fri Mar 10 15:58:23 2017 +0000
@@ -149,10 +149,10 @@
// Used in edit_entry_handler.php
$vocab["error"] = "Error";
$vocab["sched_conflict"] = "Scheduling Conflict";
-$vocab["conflict"] = "The new booking will conflict with the
following entries";
+$vocab["conflict"] = "The new booking will conflict with the
following entries:";
$vocab["no_conflicts"] = "No scheduling conflicts";
-$vocab["rules_broken"] = "The new booking will conflict with the
following policies";
-$vocab["rules_broken_notices"] = "[Information only] The new booking would
conflict with the following policies";
+$vocab["rules_broken"] = "The new booking will conflict with the
following policies:";
+$vocab["rules_broken_notices"] = "[Information only] The new booking would
conflict with the following policies:";
$vocab["no_rules_broken"] = "No policy conflicts";
$vocab["schedule"] = "Schedule";
$vocab["policy"] = "Policy";
diff -r b3d5d069208d -r a93f1be83329 web/lang/lang.fr
--- a/web/lang/lang.fr Fri Mar 10 13:00:46 2017 +0000
+++ b/web/lang/lang.fr Fri Mar 10 15:58:23 2017 +0000
@@ -135,9 +135,9 @@
// Used in edit_entry_handler.php
$vocab["error"] = "Erreur";
$vocab["sched_conflict"] = "Conflit entre réservations";
-$vocab["conflict"] = "La nouvelle réservation entre en conflit avec
la(les) réservation(s) suivante(s)";
+$vocab["conflict"] = "La nouvelle réservation entre en conflit avec
la(les) réservation(s) suivante(s) :";
$vocab["no_conflicts"] = "Aucun conflits";
-$vocab["rules_broken"] = "La nouvelle réservation est en conflit avec
les règles suivantes";
+$vocab["rules_broken"] = "La nouvelle réservation est en conflit avec
les règles suivantes :";
$vocab["no_rules_broken"] = "Aucun conflits";
$vocab["schedule"] = "Calendrier";
$vocab["policy"] = "Règles";
------------------------------------------------------------------------------
Announcing the Oxford Dictionaries API! The API offers world-renowned
dictionary content that is easy and intuitive to access. Sign up for an
account today to start using our lexical data to power your apps and
projects. Get started today and enter our developer competition.
http://sdm.link/oxford
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
