Add subtasks and comments history

1 files changed, 21 insertions, 32 deletions

diff --git a/app/Core/Translator.php b/app/Core/Translator.php
index c34a40ba..43e934a9 100644
--- a/app/Core/Translator.php
+++ b/app/Core/Translator.php
@@ -27,58 +27,47 @@ class Translator
     private static $locales = array();
 
     /**
-     * Flag to enable HTML escaping
+     * Get a translation
      *
-     * @static
-     * @access private
-     * @var boolean
-     */
-    private static $enable_escaping = true;
-
-    /**
-     * Disable HTML escaping for translations
+     * $translator->translate('I have %d kids', 5);
      *
-     * @static
      * @access public
+     * @param  string   $identifier       Default string
+     * @return string
      */
-    public static function disableEscaping()
+    public function translate($identifier)
     {
-        self::$enable_escaping = false;
-    }
+        $args = func_get_args();
 
-    /**
-     * Enable HTML escaping for translations
-     *
-     * @static
-     * @access public
-     */
-    public static function enableEscaping()
-    {
-        self::$enable_escaping = true;
+        array_shift($args);
+        array_unshift($args, $this->get($identifier, $identifier));
+
+        foreach ($args as &$arg) {
+            $arg = htmlspecialchars($arg, ENT_QUOTES, 'UTF-8', false);
+        }
+
+        return call_user_func_array(
+            'sprintf',
+            $args
+        );
     }
 
     /**
-     * Get a translation
+     * Get a translation with no HTML escaping
      *
-     * $translator->translate('I have %d kids', 5);
+     * $translator->translateNoEscaping('I have %d kids', 5);
      *
      * @access public
-     * @param $identifier
+     * @param  string   $identifier       Default string
      * @return string
      */
-    public function translate($identifier)
+    public function translateNoEscaping($identifier)
     {
         $args = func_get_args();
 
         array_shift($args);
         array_unshift($args, $this->get($identifier, $identifier));
 
-        if (self::$enable_escaping) {
-            foreach ($args as &$arg) {
-                $arg = htmlspecialchars($arg, ENT_QUOTES, 'UTF-8', false);
-            }
-        }
-
         return call_user_func_array(
             'sprintf',
             $args