This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 6.1 has been updated
       via  a785831b46f329657efd124a9d026465ac5d3ca0 (commit)
      from  4cd12d646c2ef4a2e3c265b101d4af949f8b1a1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a785831b46f329657efd124a9d026465ac5d3ca0

commit a785831b46f329657efd124a9d026465ac5d3ca0
Author: Franck Villaume <[email protected]>
Date:   Sun Jan 14 12:23:26 2018 +0100

    missing translation

diff --git a/src/common/include/User.class.php 
b/src/common/include/User.class.php
index 1ba9b46..bc67da8 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -1783,7 +1783,7 @@ Email: %3$s
         */
        function setUneditable($data) {
                if (!is_array($data)) {
-                       $this->setError('Error: Cannot Update list of 
uneditable fields: not an array');
+                       $this->setError(_('Error')._(': ')._('Cannot Update 
list of uneditable fields: not an array'));
                        return false;
                }
 
@@ -1791,7 +1791,7 @@ Email: %3$s
                $sql = 'UPDATE users SET uneditable = $1 WHERE user_id = $2';
                $res = db_query_params($sql, array($serializedData, 
$this->getID()));
                if (!$res || db_affected_rows($res) < 1) {
-                       $this->setError('Error: Cannot Update list of 
uneditable fields: '.db_error());
+                       $this->setError(_('Error')._(': ')._('Cannot Update 
list of uneditable fields')._(': ').db_error());
                        return false;
                }
                $this->data_array['uneditable'] = $serializedData;
@@ -1806,7 +1806,7 @@ Email: %3$s
         */
        function setHidden($data) {
                if (!is_array($data)) {
-                       $this->setError('Error: Cannot Update list of hidden 
fields: not an array');
+                       $this->setError(_('Error')._(': ')._('Cannot Update 
list of hidden fields: not an array'));
                        return false;
                }
 
@@ -1814,7 +1814,7 @@ Email: %3$s
                $sql = 'UPDATE users SET hidden = $1 WHERE user_id = $2';
                $res = db_query_params($sql, array($serializedData, 
$this->getID()));
                if (!$res || db_affected_rows($res) < 1) {
-                       $this->setError('Error: Cannot Update list of hidden 
fields: '.db_error());
+                       $this->setError(_('Error')._(': ')._('Cannot Update 
list of hidden fields')._(': ').db_error());
                        return false;
                }
                $this->data_array['hidden'] = $serializedData;

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/User.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to