From 8ee9bbba65840113602728cfe9744163f15f56d0 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 29 Jul 2014 13:10:27 -0500
Subject: [PATCH] i18n: Fix several reported translation issues
---
include/class.group.php | 4 +-
include/class.template.php | 4 +-
.../i18n/en_US/help/tips/emails.email.yaml | 2 +-
include/i18n/en_US/help/tips/settings.kb.yaml | 2 +-
.../i18n/en_US/help/tips/settings.pages.yaml | 2 +-
.../i18n/en_US/help/tips/settings.ticket.yaml | 2 +-
.../en_US/help/tips/staff.staff_members.yaml | 44 -------------------
.../i18n/en_US/templates/page/landing.yaml | 2 +-
include/staff/dynamic-forms.inc.php | 2 +-
include/staff/dynamic-lists.inc.php | 2 +-
include/staff/settings-access.inc.php | 2 +-
include/staff/templates/user.tmpl.php | 2 +-
include/staff/templates/users.tmpl.php | 2 +-
include/staff/ticket-view.inc.php | 2 +-
scp/js/scp.js | 2 +-
scp/tickets.php | 2 +-
16 files changed, 17 insertions(+), 61 deletions(-)
diff --git a/include/class.group.php b/include/class.group.php
index 4187f21dc..67f392190 100644
--- a/include/class.group.php
+++ b/include/class.group.php
@@ -227,9 +227,9 @@ class Group {
return $id;
$errors['err']=sprintf(__('Unable to create %s.'), __('this group'))
- .' '.__('Internal error occurrred');
+ .' '.__('Internal error occurred');
}
-
+
return false;
}
}
diff --git a/include/class.template.php b/include/class.template.php
index c9d6711ed..28b6c9d0e 100644
--- a/include/class.template.php
+++ b/include/class.template.php
@@ -23,8 +23,8 @@ class EmailTemplateGroup {
var $_templates;
static $all_groups = array(
'sys' => /* trans */ 'System Management Templates',
- 'ticket.user' => /* trans */ 'End-User Ticket Templates',
- 'ticket.staff' => /* trans */ 'Agent Ticket Templates',
+ 'ticket.user' => /* trans */ 'End-User Email Templates',
+ 'ticket.staff' => /* trans */ 'Agent Email Templates',
);
static $all_names=array(
'ticket.autoresp'=>array(
diff --git a/include/i18n/en_US/help/tips/emails.email.yaml b/include/i18n/en_US/help/tips/emails.email.yaml
index 5735bdbb6..b261c10ee 100644
--- a/include/i18n/en_US/help/tips/emails.email.yaml
+++ b/include/i18n/en_US/help/tips/emails.email.yaml
@@ -30,7 +30,7 @@ new_ticket_priority:
title: New Ticket Priority
content: >
Choose the <span class="doc-desc-title">priority</span> for new
- tickets created via ths Email Address.
+ tickets created via this Email Address.
new_ticket_department:
title: New Ticket Department
diff --git a/include/i18n/en_US/help/tips/settings.kb.yaml b/include/i18n/en_US/help/tips/settings.kb.yaml
index ea3cb117e..12f495472 100644
--- a/include/i18n/en_US/help/tips/settings.kb.yaml
+++ b/include/i18n/en_US/help/tips/settings.kb.yaml
@@ -23,7 +23,7 @@ knowledge_base_status:
Enable this setting to allow your users self-service access to
your public knowledge base articles.
<br><br>
- Knowledge base categories and FAQs can be made internal (viewable only by Agents.)
+ Knowledge base categories and FAQs can be made internal (viewable only by Agents).
links:
- title: Manage Knowledge Base
href: /scp/kb.php
diff --git a/include/i18n/en_US/help/tips/settings.pages.yaml b/include/i18n/en_US/help/tips/settings.pages.yaml
index a506e3385..487d09cf0 100644
--- a/include/i18n/en_US/help/tips/settings.pages.yaml
+++ b/include/i18n/en_US/help/tips/settings.pages.yaml
@@ -28,7 +28,7 @@ landing_page:
title: Landing Page
content: >
The <span class="doc-desc-title">Landing Page</span> is displayed on
- the front page of your your support site.
+ the front page of your support site.
offline_page:
title: Offline Page
diff --git a/include/i18n/en_US/help/tips/settings.ticket.yaml b/include/i18n/en_US/help/tips/settings.ticket.yaml
index 50693c2a3..93b041e28 100644
--- a/include/i18n/en_US/help/tips/settings.ticket.yaml
+++ b/include/i18n/en_US/help/tips/settings.ticket.yaml
@@ -28,7 +28,7 @@ default_priority:
Choose a default <span class="doc-desc-title">priority</span> for
tickets not assigned a priority automatically.
<br/><br/>
- Prioriy can be assigned via the help topic, routed department, or
+ Priority can be assigned via the help topic, routed department, or
ticket filter settings.
maximum_open_tickets:
diff --git a/include/i18n/en_US/help/tips/staff.staff_members.yaml b/include/i18n/en_US/help/tips/staff.staff_members.yaml
index 5d7b8cbe8..882bfe9ee 100644
--- a/include/i18n/en_US/help/tips/staff.staff_members.yaml
+++ b/include/i18n/en_US/help/tips/staff.staff_members.yaml
@@ -13,10 +13,6 @@
# must match the HTML #ids put into the page template.
#
---
-add_new_staff:
- title: Add New Staff
- content: >
-
staff_members:
title: Staff Members
content: >
@@ -26,48 +22,8 @@ staff_members:
broken up by pages. See the pages section below to navigate through more
results.
-checkbox_column:
- title: Manage Multiple Agents
- content: >
- By choosing a checkbox next to the name of the <span
- class="doc-desc-title">Agent</span>(s), you may alter the <span
- class="doc-desc-title">Account Status</span> to either Locked or Enabled.
- If you change the <span class="doc-desc-title">agent</span>’s status to
- Locked, then he/she will not be able to login.<br/>
- <br/>
- If you change the <span class="doc-desc-title">agent</span>’s status to
- Enabled, then all normal account settings established for that <span
- class="doc-desc-title">Agent</span> will resume.<br/>
- <br/>
- If you change the <span class="doc-desc-title">agent</span>’s status to
- Locked, then he/she will not be able to login.
-
-name:
- title: Name
- content: >
-
-username:
- title: Username
- content: >
-
status:
title: Status
content: >
This will display whether the <span class="doc-desc-title">Agent</span> is
Locked, Active, or Active (Vacation).
-
-group:
- title: Group
- content: >
-
-department:
- title: Department
- content: >
-
-created:
- title: Created
- content: >
-
-last_login:
- title: Last Login
- content: >
diff --git a/include/i18n/en_US/templates/page/landing.yaml b/include/i18n/en_US/templates/page/landing.yaml
index ceedc21a3..112bc512c 100644
--- a/include/i18n/en_US/templates/page/landing.yaml
+++ b/include/i18n/en_US/templates/page/landing.yaml
@@ -7,7 +7,7 @@
---
notes: >
The Landing Page refers to the content of the Customer Portal's
- intial view. The template modifies the content seen above the two links
+ initial view. The template modifies the content seen above the two links
<strong>Open a New Ticket</strong> and <strong>Check Ticket Status</strong>.
name: Landing
diff --git a/include/staff/dynamic-forms.inc.php b/include/staff/dynamic-forms.inc.php
index 74e3af3f9..bfa399490 100644
--- a/include/staff/dynamic-forms.inc.php
+++ b/include/staff/dynamic-forms.inc.php
@@ -95,7 +95,7 @@ if ($count) //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
<p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="Delete">
+ <input class="button" type="submit" name="delete" value="<?php echo __('Delete'); ?>">
</p>
</form>
diff --git a/include/staff/dynamic-lists.inc.php b/include/staff/dynamic-lists.inc.php
index 824473c7f..70f3d27b4 100644
--- a/include/staff/dynamic-lists.inc.php
+++ b/include/staff/dynamic-lists.inc.php
@@ -68,7 +68,7 @@ if ($count) //Show options..
?>
<p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="Delete">
+ <input class="button" type="submit" name="delete" value="<?php echo __('Delete'); ?>">
</p>
</form>
diff --git a/include/staff/settings-access.inc.php b/include/staff/settings-access.inc.php
index df927ef32..fa6fc607e 100644
--- a/include/staff/settings-access.inc.php
+++ b/include/staff/settings-access.inc.php
@@ -187,7 +187,7 @@ $manage_content = function($title, $content) use ($contents) {
</tr>
<?php $manage_content(__('Agents'), 'pwreset-staff'); ?>
<?php $manage_content(__('Clients'), 'pwreset-client'); ?>
- <?php $manage_content(__('Guess Ticket Access'), 'access-link'); ?>
+ <?php $manage_content(__('Guest Ticket Access'), 'access-link'); ?>
<tr>
<th colspan="2">
<em><b><?php echo __('Sign In Pages'); ?></b></em>
diff --git a/include/staff/templates/user.tmpl.php b/include/staff/templates/user.tmpl.php
index 68d551a05..655e92ecf 100644
--- a/include/staff/templates/user.tmpl.php
+++ b/include/staff/templates/user.tmpl.php
@@ -49,7 +49,7 @@ if ($info['error']) {
<div class="tab_content" id="info-tab">
<div class="floating-options">
- <a href="<?php echo $info['useredit'] ?: '#'; ?>" id="edituser" class="action" title="Edit"><i class="icon-edit"></i></a>
+ <a href="<?php echo $info['useredit'] ?: '#'; ?>" id="edituser" class="action" title="<?php echo __('Edit'); ?>"><i class="icon-edit"></i></a>
<a href="users.php?id=<?php echo $user->getId(); ?>" title="<?php
echo __('Manage User'); ?>" class="action"><i class="icon-share"></i></a>
</div>
diff --git a/include/staff/templates/users.tmpl.php b/include/staff/templates/users.tmpl.php
index c4c612eff..44a0644b2 100644
--- a/include/staff/templates/users.tmpl.php
+++ b/include/staff/templates/users.tmpl.php
@@ -155,7 +155,7 @@ if ($res && $num) { //Show options..
<hr/>
<p class="confirm-action" style="display:none;" id="remove-users-confirm">
<?php echo sprintf(__(
- 'Are you sure want to <b>REMOVE</b> %1$s from <strong>%2$s</strong> organization?'),
+ 'Are you sure you want to <b>REMOVE</b> %1$s from <strong>%2$s</strong>?'),
_N('selected user', 'selected users', 2),
$org->getName()); ?>
</p>
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index af406fa7a..8ca2d04c0 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -992,7 +992,7 @@ $tcount+= $ticket->getNumNotes();
<?php echo sprintf(__('Are you sure you want to <b>remove</b> %s from ban list?'), $ticket->getEmail()); ?>
</p>
<p class="confirm-action" style="display:none;" id="release-confirm">
- <?php echo sprintf(__('Are you sure you want to <b>unassign</b> ticket from %s<b>?'), $ticket->getAssigned()); ?></b>
+ <?php echo sprintf(__('Are you sure you want to <b>unassign</b> ticket from <b>%s</b>?'), $ticket->getAssigned()); ?>
</p>
<p class="confirm-action" style="display:none;" id="changeuser-confirm">
<span id="msg_warning" style="display:block;vertical-align:top">
diff --git a/scp/js/scp.js b/scp/js/scp.js
index df8a86756..b9b2a1b9f 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -748,7 +748,7 @@ $('.quicknote .delete').live('click.note', function() {
$('#new-note').live('click', function() {
var note = $(this).closest('.quicknote'),
T = $('<textarea>'),
- button = $('<input type="button">').val('Create');
+ button = $('<input type="button">').val(__('Create'));
button.click(function() {
$.post('ajax.php/' + note.data('url'),
{ note: T.redactor('get'), no_options: note.hasClass('no-options') },
diff --git a/scp/tickets.php b/scp/tickets.php
index 58aadfa3c..35542ec45 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -276,7 +276,7 @@ if($_POST && !$errors):
if(!$ticket->isAssigned() || !($assigned=$ticket->getAssigned())) {
$errors['err'] = __('Ticket is not assigned!');
} elseif($ticket->release()) {
- $msg=sprintf(__('Ticket released (unassigned) from %1$s by %2$s)'),$assigned,$thisstaff->getName());
+ $msg=sprintf(__('Ticket released (unassigned) from %1$s by %2$s'),$assigned,$thisstaff->getName());
$ticket->logActivity(__('Ticket unassigned'),$msg);
} else {
$errors['err'] = __('Problems releasing the ticket. Try again');
--
GitLab