From ce0984e102f5ce7d07277425595dad74193d4528 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 17 Oct 2014 16:23:07 +0200
Subject: Fix i18n

---
 app/views/configure/archiving.phtml | 19 ++++++++++++-------
 app/views/user/manage.phtml         |  4 +++-
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'app/views')

diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 8f424c126..f469d343c 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -58,20 +58,25 @@
 		<legend><?php echo _t('advanced'); ?></legend>
 
 		<div class="form-group">
-		<p class="group-name"><?php echo _t('current_user'); ?></p>
+			<label class="group-name"><?php echo _t('current_user'); ?></label>
 			<div class="group-controls">
-				<p><?php echo _t('articles', formatNumber($this->nb_total)), ' — ', formatBytes($this->size_user); ?></p>
-				<input type="hidden" name="optimiseDatabase" value="1" />
-				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
-				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
+				<?php echo _t('conf.users.articles_and_size', formatNumber($this->nb_total), formatBytes($this->size_user)); ?>
 			</div>
 		</div>
 
 		<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
 		<div class="form-group">
-			<p class="group-name"><?php echo _t('users'); ?></p>
+			<label class="group-name"><?php echo _t('users'); ?></label>
 			<div class="group-controls">
-				<p><?php echo formatBytes($this->size_total); ?></p>
+				<?php echo formatBytes($this->size_total); ?>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<input type="hidden" name="optimiseDatabase" value="1" />
+				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
+				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
 			</div>
 		</div>
 		<?php } ?>
diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml
index 65e60add5..89c91e06c 100644
--- a/app/views/user/manage.phtml
+++ b/app/views/user/manage.phtml
@@ -64,7 +64,9 @@
 					<?php } ?>
 				</select>
 
-				<p><?php echo _t('articles', formatNumber($this->nb_articles)), ', ', formatBytes($this->size_user); ?></p>
+				<p><?php echo _t('admin.users.articles_and_size',
+				                 formatNumber($this->nb_articles),
+				                 formatBytes($this->size_user)); ?></p>
 			</div>
 		</div>
 
-- 
cgit v1.2.3