[Pkg-owncloud-commits] [owncloud] 263/457: L10n for federated cloud ID and rtrim '/' on ID

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 70f0cf67a53de5e301e4e773f552b2296dfabaac
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jun 2 15:16:21 2015 +0200

    L10n for federated cloud ID and rtrim '/' on ID
---
 apps/files_sharing/settings-personal.php           | 2 +-
 apps/files_sharing/templates/settings-personal.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index b9ae791..1aff784 100644
--- a/apps/files_sharing/settings-personal.php
+++ b/apps/files_sharing/settings-personal.php
@@ -24,7 +24,7 @@
 
 $uid = \OC::$server->getUserSession()->getUser()->getUID();
 $server = \OC::$server->getURLGenerator()->getAbsoluteURL('/');
-$cloudID = $uid . '@' . \OCA\Files_Sharing\Helper::removeProtocolFromUrl($server);
+$cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/');
 
 $tmpl = new OCP\Template('files_sharing', 'settings-personal');
 $tmpl->assign('cloudId', $cloudID);
diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php
index a045b5d..84d8e8a 100644
--- a/apps/files_sharing/templates/settings-personal.php
+++ b/apps/files_sharing/templates/settings-personal.php
@@ -6,7 +6,7 @@
 	<h2><?php p($l->t('Federated Cloud'));?></h2>
 
 	<p>
-		Your Federated Cloud Id: <?php p($_['cloudId']); ?>
+		<?php p($l->t('Your Federated Cloud ID: %s', [$_['cloudId']])); ?>
 	</p>
 
 </div>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git