[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2131-g11700e3

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Wed Sep 6 15:11:01 CEST 2017


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, master has been updated
       via  11700e37bca501c9df787eec2dad9de6a6cfddd8 (commit)
       via  d8594256b1be008d043244302b55096a4f645c9d (commit)
       via  a4e0e17b8322251beab143e860ab900242fb3432 (commit)
       via  27badcd13faa23b4e21c3745c8daaa22dcfce89e (commit)
      from  b48d54f2c3a186c6a47f76ea3a15f99a4343f392 (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=11700e37bca501c9df787eec2dad9de6a6cfddd8

commit 11700e37bca501c9df787eec2dad9de6a6cfddd8
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Wed Sep 6 15:10:55 2017 +0200

    Less strings

diff --git a/src/www/snippet/detail.php b/src/www/snippet/detail.php
index 837710a..6bbf38b 100644
--- a/src/www/snippet/detail.php
+++ b/src/www/snippet/detail.php
@@ -135,7 +135,7 @@ if ($type=='snippet') {
 
 	$rows=db_numrows($result);
 	if (!$result || $rows < 1) {
-		echo $HTML->error_msg(_('Error: no versions found'));
+		echo $HTML->error_msg(_('Error')._(': ')._('no versions found'));
 	} else {
 		echo '
 		<h3>' ._('Versions Of This Package')._(':').'</h3>

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

commit d8594256b1be008d043244302b55096a4f645c9d
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Wed Sep 6 15:02:57 2017 +0200

    Less strings

diff --git a/src/common/include/User.class.php b/src/common/include/User.class.php
index 1a172f9..1ba9b46 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -255,7 +255,7 @@ class FFUser extends FFError {
 				$this->data_array =& $res;
 			} elseif (db_numrows($res) < 1) {
 				//function in class we extended
-				$this->setError(_('User Not Found'));
+				$this->setError(_('User not found'));
 				$this->data_array = array();
 				return;
 			} else {
diff --git a/src/plugins/scmcvs/www/acl.php b/src/plugins/scmcvs/www/acl.php
index 2e81f6d..54912c8 100644
--- a/src/plugins/scmcvs/www/acl.php
+++ b/src/plugins/scmcvs/www/acl.php
@@ -50,7 +50,7 @@ if (count($matches) == 0) {
 	$userName = $matches2[count($matches2)-1];
 	$User = user_get_object_by_name($userName);
 	if (!$User || !is_object($User)) {
-		exit_error(sprintf(_('User not found %s'),$userName),'home');
+		exit_error(_('User not found')._(': ').$userName, 'home');
 	}
 	session_set_new($User->getID());
 
diff --git a/src/www/developer/diary.php b/src/www/developer/diary.php
index 4ad7d7c..47913cf 100644
--- a/src/www/developer/diary.php
+++ b/src/www/developer/diary.php
@@ -38,7 +38,7 @@ if ($diary_user) {
 
 	$user_obj=user_get_object($diary_user);
 	if (!$user_obj or !$user_obj->isActive()) {
-		exit_error(_('User could not be found.'),'home');
+		exit_error(_('User not found'), 'home');
 	} elseif ($user_obj->isError()) {
 		exit_error($user_obj->getErrorMessage(),'home');
 	}

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

commit a4e0e17b8322251beab143e860ab900242fb3432
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Wed Sep 6 14:43:49 2017 +0200

    Less strings

diff --git a/src/plugins/globalsearch/common/globalsearch_edit_utils.php b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
index dc6438f..97154ef 100644
--- a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
+++ b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
@@ -65,7 +65,7 @@ function globalsearch_admin_table_postadd () {
 				    $new_onlysw,
 				    $new_enabled,
 				    $new_rank))) {
-		echo _('Associated forge successfully added.');
+		echo _('Associated Forge successfully added.');
         } else {
                 echo db_error();
         }
@@ -113,7 +113,7 @@ function globalsearch_admin_table_confirmdelete ($id) {
 function globalsearch_admin_table_delete ($id) {
         if (db_query_params ('DELETE FROM plugin_globalsearch_assoc_site WHERE assoc_site_id=$1',
 			     array($id))) {
-		echo _('Associated forge successfully deleted.');
+		echo _('Associated Forge successfully deleted.');
         } else {
                 echo db_error();
         }
@@ -179,7 +179,7 @@ function globalsearch_admin_table_postedit ($id) {
 				    $new_enabled,
 				    $new_rank,
 				    $id))) {
-		echo _('Associated forge successfully modified.');
+		echo _('Associated Forge successfully modified.');
         } else {
                 echo db_error();
         }
@@ -197,7 +197,7 @@ function globalsearch_admin_table_show () {
 		$rows = db_numrows($result);
 
 		$cell_data=array();
-		$cell_data[]=array(ngettext('Associated forge','Associated forges',$rows).' '.util_make_link(getStringFromServer('PHP_SELF').'?function=add', '['._('add new').']'),
+		$cell_data[]=array(ngettext('Associated Forge','Associated Forges',$rows).' '.util_make_link(getStringFromServer('PHP_SELF').'?function=add', '['._('add new').']'),
 			'colspan' => 8);
 
 		echo '<table border="0" width="100%">';

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=27badcd13faa23b4e21c3745c8daaa22dcfce89e

commit 27badcd13faa23b4e21c3745c8daaa22dcfce89e
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Wed Sep 6 13:46:21 2017 +0200

    Less strings

diff --git a/src/www/snippet/detail.php b/src/www/snippet/detail.php
index 193aae3..837710a 100644
--- a/src/www/snippet/detail.php
+++ b/src/www/snippet/detail.php
@@ -207,6 +207,6 @@ if ($type=='snippet') {
 
 } else {
 
-	exit_error(_('Error: was the URL mangled?'));
+	exit_error(_('Error: mangled URL?'));
 
 }

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

Summary of changes:
 src/common/include/User.class.php                           | 2 +-
 src/plugins/globalsearch/common/globalsearch_edit_utils.php | 8 ++++----
 src/plugins/scmcvs/www/acl.php                              | 2 +-
 src/www/developer/diary.php                                 | 2 +-
 src/www/snippet/detail.php                                  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list