Merge remote-tracking branch 'origin/master' into drizzle

1 files changed, 6 insertions, 11 deletions

diff --git a/scripts/advisor2php b/scripts/advisor2php
index 28a58176fe..c34f2870d1 100644
--- a/scripts/advisor2php
+++ b/scripts/advisor2php
@@ -5,10 +5,10 @@
  * by gettext for generating po(t) files.
  */
 
-if (!file_exists('./libraries/advisor.class.php')) {
+if (!file_exists('./libraries/Advisor.class.php')) {
     chdir('..');
 }
-include './libraries/advisor.class.php';
+include './libraries/Advisor.class.php';
 
 $rules = Advisor::parseRulesFile();
 
@@ -18,16 +18,11 @@ echo "/* This is automatically generated file from libraries/advisory_rules.txt
 
 foreach($rules['rules'] as $rule) {
     echo "\n";
-    echo "echo __('" . addslashes($rule['name']) . "');\n";
-    echo "echo __('" . addslashes($rule['issue']) . "');\n";
-    echo "echo __('" . addslashes($rule['recommendation']) . "');\n";
+    echo "printf(__('" . addslashes(Advisor::escapePercent($rule['name'])) . "'));\n";
+    echo "printf(__('" . addslashes(Advisor::escapePercent($rule['issue'])) . "'));\n";
+    echo "printf(__('" . addslashes(Advisor::escapePercent($rule['recommendation'])) . "'));\n";
     $jst = Advisor::splitJustification($rule);
-    if (count($jst) > 1) {
-        /* printf is used here just to ensure proper type of string */
-        echo "printf(__('" . addslashes($jst[0]) . "'), 0);\n";
-    } else {
-        echo "echo __('" . addslashes($jst[0]) . "');\n";
-    }
+    echo "printf(__('" . addslashes(Advisor::escapePercent($jst[0])) . "'));\n";
 }
 
 ?>