From 44ade43efb5369e86e30a49ef2306b7ee9116683 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 18 Jul 2014 08:52:57 -0500
Subject: [PATCH] i18n: Remove 'Dept' abbreviations and misspellings

---
 include/staff/departments.inc.php | 2 +-
 include/staff/profile.inc.php     | 3 ++-
 include/staff/staff.inc.php       | 2 +-
 include/staff/ticket-open.inc.php | 2 +-
 include/staff/ticket-view.inc.php | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index 7bad3711e..85a7c0267 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -60,7 +60,7 @@ else
             <th width="80"><a  <?php echo $type_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Type');?></a></th>
             <th width="70"><a  <?php echo $users_sort; ?>href="departments.php?<?php echo $qstr; ?>&sort=users"><?php echo __('Users');?></a></th>
             <th width="300"><a  <?php echo $email_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th>
-            <th width="200"><a  <?php echo $manager_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=manager"><?php echo __('Dept. Manager');?></a></th>
+            <th width="200"><a  <?php echo $manager_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=manager"><?php echo __('Department Manager');?></a></th>
         </tr>
     </thead>
     <tbody>
diff --git a/include/staff/profile.inc.php b/include/staff/profile.inc.php
index 65d66172b..a5daad3c5 100644
--- a/include/staff/profile.inc.php
+++ b/include/staff/profile.inc.php
@@ -168,7 +168,8 @@ $info['id']=$staff->getId();
                 <select name="default_signature_type">
                   <option value="none" selected="selected">&mdash; <?php echo __('None');?> &mdash;</option>
                   <?php
-                  $options=array('mine'=>__('My Signature'),'dept'=>__('Deptartment Signature (if set)'));
+                   $options=array('mine'=>__('My Signature'),'dept'=>sprintf(__('Department Signature (%s)'),
+                       __('if set' /* This is used in 'Department Signature (>if set<)' */)));
                   foreach($options as $k=>$v) {
                       echo sprintf('<option value="%s" %s>%s</option>',
                                 $k,($info['default_signature_type']==$k)?'selected="selected"':'',$v);
diff --git a/include/staff/staff.inc.php b/include/staff/staff.inc.php
index 353e40470..ac46767ab 100644
--- a/include/staff/staff.inc.php
+++ b/include/staff/staff.inc.php
@@ -204,7 +204,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong><?php echo __('Account Status & Settings');?></strong>: <?php echo __('Dept. and assigned group controls access permissions.');?></em>
+                <em><strong><?php echo __('Account Status & Settings');?></strong>: <?php echo __('Department and group assigned control access permissions.');?></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php
index 81218adec..cbfa0c840 100644
--- a/include/staff/ticket-open.inc.php
+++ b/include/staff/ticket-open.inc.php
@@ -355,7 +355,7 @@ if ($_POST)
                     <?php
                     } ?>
                     <label><input type="radio" name="signature" value="dept"
-                        <?php echo ($info['signature']=='dept')?'checked="checked"':''; ?>> <?php echo __('Dept. Signature (if set)');?></label>
+                        <?php echo ($info['signature']=='dept')?'checked="checked"':''; ?>> <?php echo sprintf(__('Department Signature (%s)'), __('if set')); ?></label>
                 </td>
              </tr>
             </table>
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index f95112dbd..031b79446 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -438,7 +438,7 @@ $tcount+= $ticket->getNumNotes();
         <li><a id="note_tab" href="#note"><?php echo __('Post Internal Note');?></a></li>
         <?php
         if($thisstaff->canTransferTickets()) { ?>
-        <li><a id="transfer_tab" href="#transfer"><?php echo __('Dept. Transfer');?></a></li>
+        <li><a id="transfer_tab" href="#transfer"><?php echo __('Department Transfer');?></a></li>
         <?php
         }
 
@@ -594,7 +594,7 @@ $tcount+= $ticket->getNumNotes();
                     if($dept && $dept->canAppendSignature()) { ?>
                     <label><input type="radio" name="signature" value="dept"
                         <?php echo ($info['signature']=='dept')?'checked="checked"':''; ?>>
-                        Dept. Signature (<?php echo Format::htmlchars($dept->getName()); ?>)</label>
+                        <?php echo sprintf(__('Department Signature (%s)'), Format::htmlchars($dept->getName())); ?></label>
                     <?php
                     } ?>
                 </td>
-- 
GitLab