Changeset 317

Timestamp:

02/08/07 23:24:54 (2 years ago)

Author:

rats

Message:

- GUI:

• changed behavior of string translation and added optional javascript variable
  

- SETUP:

• modified Makefiles
  

Files:

• trunk/BSDmakefile (modified) (3 diffs)
• trunk/CHANGELOG (modified) (1 diff)
• trunk/gui/client/email_accounts.php (modified) (1 diff)
• trunk/gui/include/i18n.php (modified) (4 diffs)

trunk/BSDmakefile

@@ -1 @@
-
+
-.include <Makefile.inc>
-
@@ -9 +9 @@
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_LOG)/vhcs2-arpl-msgr
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_VIRTUAL)
+        $(SYSTEM_MAKE_DIRS) $(SYSTEM_FCGI)
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_MAIL_VIRTUAL)
-        $(SYSTEM_MAKE_DIRS) $(SYSTEM_APACHE_BACK_LOG)
-        cd ./configs && $(MAKE) install
- 
- 
+
+
-        cd ./keys && $(MAKE) install
-
+
-uninstall:
-        cd ./tools && $(MAKE) uninstall
-        cd ./configs && $(MAKE) uninstall
- 
- 
+
+
-        cd ./keys && $(MAKE) uninstall
-        rm -rf $(SYSTEM_CONF)
@@ -26 +27 @@
-        rm -rf $(SYSTEM_LOG)
-        rm -rf $(SYSTEM_VIRTUAL)
+        rm -rf $(SYSTEM_FCGI)
-        rm -rf $(SYSTEM_MAIL_VIRTUAL)
-        rm -rf $(SYSTEM_APACHE_BACK_LOG)
-        rm -rf ./*~
-
+

trunk/CHANGELOG

@@ -17 +17 @@
-        - LANGUAGES:
-                Spanish: added missing language strings
+        - GUI:
+                changed behavior of string translation and added optional javascript variable
+        - SETUP:
+                modified Makefiles
-
-2007-02-08 Laurent DECLERCQ

trunk/gui/client/email_accounts.php

@@ -459 +459 @@
-                        'TR_TOTAL_MAIL_ACCOUNTS' => tr('Mails total'),
-                        'TR_DELETE' => tr('Delete'),
-
+, 1
-                     )
-              );

trunk/gui/include/i18n.php

@@ -26 +26 @@
- *      @version                2.0
- *  @author                     VHCS Team, Benedikt Heintel (2007)
+ *
+ *      @param          $msgid          string to translate
+ *      @param          $js                     whether the input string is in javascript or not
+ *      @return                                 translated or original string
- **/
-
+, $js = false
-        global $sql, $default_lang;
-
@@ -33 +37 @@
-
-        if (!$sql) {
-htmlentities($msgid, ENT_COMPAT, "UTF-8"
+($js ? $msgid : replace_html(htmlentities($msgid, ENT_COMPAT, "UTF-8"))
-        }
-        else {
@@ -45 +49 @@
-
-                if (!$res) {
-htmlentities($msgid, ENT_COMPAT, $encoding
+($js ? $msgid : replace_html(htmlentities($msgid, ENT_COMPAT, $encoding))
-                }
-                elseif ($res->RowCount() == 0) {
-htmlentities($msgid, ENT_COMPAT, $encoding
+($js ? $msgid : replace_html(htmlentities($msgid, ENT_COMPAT, $encoding))
-                }
-                else {
-                        $data = $res->FetchRow();
-                        if ($data['msgstr'] == '') {
-htmlentities($msgid, ENT_COMPAT, $encoding
+($js ? $msgid : replace_html(htmlentities($msgid, ENT_COMPAT, $encoding))
-                        }
-                        else {
-htmlentities($data['msgstr'], ENT_COMPAT, $encoding
+($js ? $data['msgstr'] : replace_html(htmlentities($data['msgstr'], ENT_COMPAT, $encoding))
-                        }
-                }
@@ -62 +66 @@
-}
-
+/**
+ *      Function:               replace_html
+ *      Description:    replaces special encoded strings back to their original signs
+ *
+ *      @access                 public
+ *      @version                1.0
+ *  @author                     VHCS Team, Benedikt Heintel (2007)
+ *
+ *      @param          $string         string to replace chars
+ *      @return                                 string with replaced chars
+ **/
+function replace_html($string) {
+
+        $pattern = array (
+                                                "=<b>=is",
+                                                "=</b>=is",
+                                                "=<i>=is",
+                                                "=</i>=is",
+                                                "=<br>=is"
+                                         );
+
+        $replacement = array (
+                                                        "<b>",
+                                                        "</b>",
+                                                        "<i>",
+                                                        "</i>",
+                                                        "<br />"
+                                                 );
+
+        $string = preg_replace($pattern, $replacement, $string);
+
+        return $string;
+}
+
-?>