[Fusionforge-commits] FusionForge branch master updated. 6.0.4-698-ga8ad3db

[Franck Villaume]

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  a8ad3dbea6dd25ef39036d5ae5e11322da0e9e2e (commit)
       via  1257f05053d29c26160a28bc88070731a76879f3 (commit)
      from  7af105b63c651469987e257ff571969ac134a2a5 (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=a8ad3dbea6dd25ef39036d5ae5e11322da0e9e2e

commit a8ad3dbea6dd25ef39036d5ae5e11322da0e9e2e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jul 10 19:31:48 2016 +0200

    missing translation

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 0b66c8c..8ce01bd 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1067,7 +1067,7 @@ if (isset($params['group']) && $params['group']) {
 			';
 	}
 
-	function jQueryUIconfirmBox($id = 'dialog-confirm', $title = 'Confirm your action', $message = 'Do you confirm your action?') {
+	function jQueryUIconfirmBox($id = 'dialog-confirm', $title = _('Confirm your action'), $message = _('Do you confirm your action?')) {
 		$htmlcode = html_ao('div', array('id' => $id, 'title' => $title, 'class' => 'hide'));
 		$htmlcode .= html_e('p', array(), html_e('span', array('class' => 'ui-icon ui-icon-alert', 'style' => 'float:left; margin:0 7px 20px 0;'), '', false).$message);
 		$htmlcode .= html_ac(html_ap() -1);

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

commit 1257f05053d29c26160a28bc88070731a76879f3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jul 10 19:18:43 2016 +0200

    fix description for notifiction. no html

diff --git a/src/common/docman/views/listfile.php b/src/common/docman/views/listfile.php
index c186484..d94324c 100644
--- a/src/common/docman/views/listfile.php
+++ b/src/common/docman/views/listfile.php
@@ -350,7 +350,7 @@ if (isset($nested_docs[$dirid]) && is_array($nested_docs[$dirid])) {
 				}
 				$nextcell .= util_make_link($redirecturl.'&action=monitorfile&option='.$option.'&fileid='.$d->getID(), $image, array('title' => $titleMonitor));
 			}
-			$nextcell .= util_make_link('#', html_image('ic/mail-send.png', 22, 22, array('alt' => _('Notify'))), array('onclick' => 'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\', lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' , id:'.$d->getID().', groupId:'.$d->Group->getID().', docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFileName()).'\', description:\''.addslashes($d->getDescription()).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')), true);
+			$nextcell .= util_make_link('#', html_image('ic/mail-send.png', 22, 22, array('alt' => _('Notify'))), array('onclick' => 'javascript:controllerListFile.toggleNotifyUserView({action:\''.util_make_uri($notifyaction).'\', lockIntervalDelay: 60000, childGroupId: '.util_ifsetor($childgroup_id, 0).' , id:'.$d->getID().', groupId:'.$d->Group->getID().', docgroupId:'.$d->getDocGroupID().', title:\''.addslashes($d->getName()).'\', filename:\''.addslashes($d->getFileName()).'\', description:\''.addslashes(strip_tags($d->getDescription())).'\', isURL:\''.$d->isURL().'\', isText:\''.$d->isText().'\', isHtml:\''.$d->isHtml().'\', docManURL:\''.util_make_uri('/docman').'\'})', 'title' => _('Notify users')), true);
 			$cells[][] = $nextcell;
 		}
 		echo $HTML->multiTableRow(array(), $cells);

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

Summary of changes:
 src/common/docman/views/listfile.php | 2 +-
 src/www/include/Layout.class.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge