From 05105af7173e813ac8d50759756fe1a2d3211929 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Fri, 2 May 2014 16:12:33 +0200
Subject: [PATCH] update wording for Character groups

---
 views/html/charactergroups/creategroup.tpl | 2 +-
 views/html/charactergroups/deletegroup.tpl | 4 ++--
 views/html/charactergroups/editgroup.tpl   | 2 +-
 views/html/charactergroups/group.tpl       | 6 +++---
 views/html/charactergroups/groupsgroup.tpl | 2 +-
 views/html/charactergroups/managegroup.tpl | 1 -
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/views/html/charactergroups/creategroup.tpl b/views/html/charactergroups/creategroup.tpl
index e2a0e306..c0926aee 100644
--- a/views/html/charactergroups/creategroup.tpl
+++ b/views/html/charactergroups/creategroup.tpl
@@ -9,7 +9,7 @@
 	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$groupsgroup['url']),1)?>"><?=$groupsgroup['name']?></a></li>
 </ul>
 
-<h1><?=_('New Character group')?></h1>
+<h1><?=sprintf(_('New %s Character group'), $groupsgroup['name'])?></h1>
 <?php if($validation !== true) : ?>
 <ul>
 	<?php foreach($validation as $field => &$settings) : ?>
diff --git a/views/html/charactergroups/deletegroup.tpl b/views/html/charactergroups/deletegroup.tpl
index 85e682a4..fc2460c4 100644
--- a/views/html/charactergroups/deletegroup.tpl
+++ b/views/html/charactergroups/deletegroup.tpl
@@ -8,9 +8,9 @@
 	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('index',$seminary['url']),1)?>"><?=_('Character Groups')?></a></li>
 	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$groupsgroup['url']),1)?>"><?=$groupsgroup['name']?></a></li>
 </ul>
-<h1><?=_('Delete Character group')?></h1>
+<h1><?=sprintf(_('Delete %s Character group'), $groupsgroup['name'])?></h1>
 
-<?=sprintf(_('Should the Character group “%s” really be deleted?'), $group['name'])?>
+<?=sprintf(_('Should the %s Character group “%s” really be deleted?'), $groupsgroup['name'], $group['name'])?>
 <form method="post">
 	<input type="submit" name="delete" value="<?=_('delete')?>" />
 	<input type="submit" name="not-delete" value="<?=_('cancel')?>" />
diff --git a/views/html/charactergroups/editgroup.tpl b/views/html/charactergroups/editgroup.tpl
index 8836be07..fd0bd6e5 100644
--- a/views/html/charactergroups/editgroup.tpl
+++ b/views/html/charactergroups/editgroup.tpl
@@ -9,7 +9,7 @@
 	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$groupsgroup['url']),1)?>"><?=$groupsgroup['name']?></a></li>
 </ul>
 
-<h1><?=_('Edit Character group')?></h1>
+<h1><?=sprintf(_('Edit %s Character group'), $groupsgroup['name'])?></h1>
 <?php if($validation !== true) : ?>
 <ul>
 	<?php foreach($validation as $field => &$settings) : ?>
diff --git a/views/html/charactergroups/group.tpl b/views/html/charactergroups/group.tpl
index 00197e32..4d59cc19 100644
--- a/views/html/charactergroups/group.tpl
+++ b/views/html/charactergroups/group.tpl
@@ -11,9 +11,9 @@
 
 <?php if(count(array_intersect(array('admin', 'moderator'), \hhu\z\controllers\SeminaryController::$character['characterroles'])) > 0) : ?>
 <nav class="admin">
-	<li><a href="<?=$linker->link(array('editgroup',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=_('Edit Character group')?></a></li>
-	<li><a href="<?=$linker->link(array('deletegroup',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=_('Delete Character group')?></a></li>
-	<li><a href="<?=$linker->link(array('managegroup',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=_('Manage Character group')?></a></li>
+	<li><a href="<?=$linker->link(array('editgroup',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=sprintf(_('Edit %s Character group'), $groupsgroup['name'])?></a></li>
+	<li><a href="<?=$linker->link(array('deletegroup',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=sprintf(_('Delete %s Character group'), $groupsgroup['name'])?></a></li>
+	<li><a href="<?=$linker->link(array('managegroup',$seminary['url'],$groupsgroup['url'],$group['url']),1)?>"><?=sprintf(_('Manage %s Character group'), $groupsgroup['name'])?></a></li>
 </nav>
 <?php endif ?>
 
diff --git a/views/html/charactergroups/groupsgroup.tpl b/views/html/charactergroups/groupsgroup.tpl
index 5f391183..3bbe6fa3 100644
--- a/views/html/charactergroups/groupsgroup.tpl
+++ b/views/html/charactergroups/groupsgroup.tpl
@@ -18,7 +18,7 @@
 <h1><?=$groupsgroup['name']?></h1>
 <?php if(count(array_intersect(array('admin', 'moderator'), \hhu\z\controllers\SeminaryController::$character['characterroles'])) > 0) : ?>
 <nav class="admin">
-	<li><a href="<?=$linker->link(array('creategroup',$seminary['url'],$groupsgroup['url']), 1)?>"><?=_('Create new Character group')?></a></li>
+	<li><a href="<?=$linker->link(array('creategroup',$seminary['url'],$groupsgroup['url']), 1)?>"><?=sprintf(_('Create new %s Character group'), $groupsgroup['name'])?></a></li>
 </nav>
 <?php endif ?>
 <ol class="cglist">
diff --git a/views/html/charactergroups/managegroup.tpl b/views/html/charactergroups/managegroup.tpl
index 34bc54fb..edac4adc 100644
--- a/views/html/charactergroups/managegroup.tpl
+++ b/views/html/charactergroups/managegroup.tpl
@@ -9,7 +9,6 @@
 	<li><i class="fa fa-chevron-right fa-fw"></i><a href="<?=$linker->link(array('groupsgroup',$seminary['url'],$groupsgroup['url']),1)?>"><?=$groupsgroup['name']?></a></li>
 </ul>
 
-<h1><?=_('Manage Character group')?></h1>
 <div class="gbanner cf">
 	<?php if(!is_null($group['seminaryupload_id'])) : ?>
 	<img src="<?=$linker->link(array('uploads','charactergroup',$seminary['url'],$groupsgroup['url'],$group['url']))?>" class="gbanner">