From 61825b3854ab1b9c567dd8d7c1ac2e9bd131baed Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 29 Aug 2014 15:26:58 +0000
Subject: [PATCH] Add translation context to ticket states
Add context to ticket state name (noun) and action (verbs)
Conflicts:
include/class.forms.php
---
include/class.forms.php | 30 +++++++++++++--------------
include/client/view.inc.php | 2 +-
include/staff/settings-system.inc.php | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/class.forms.php b/include/class.forms.php
index b66421adf..2f597eb07 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -1028,27 +1028,27 @@ class TicketStateField extends ChoiceField {
static $_states = array(
'open' => array(
- 'name' => /* @trans */ 'Open',
- 'verb' => /* @trans */ 'Open'
+ 'name' => /* @trans, @context "ticket state name" */ 'Open',
+ 'verb' => /* @trans, @context "ticket state action" */ 'Open'
),
'resolved' => array(
- 'name' => /* @trans */ 'Resolved',
- 'verb' => /* @trans */ 'Resolve'
+ 'name' => /* @trans, @context "ticket state name" */ 'Resolved',
+ 'verb' => /* @trans, @context "ticket state action" */ 'Resolve'
),
'closed' => array(
- 'name' => /* @trans */ 'Closed',
- 'verb' => /* @trans */ 'Close'
+ 'name' => /* @trans, @context "ticket state name" */ 'Closed',
+ 'verb' => /* @trans, @context "ticket state action" */ 'Close'
)
);
// Private states
static $_privatestates = array(
'archived' => array(
- 'name' => /* @trans */ 'Archived',
- 'verb' => /* @trans */ 'Archive'
+ 'name' => /* @trans, @context "ticket state name" */ 'Archived',
+ 'verb' => /* @trans, @context "ticket state action" */ 'Archive'
),
'deleted' => array(
- 'name' => /* @trans */ 'Deleted',
- 'verb' => /* @trans */ 'Delete'
+ 'name' => /* @trans, @context "ticket state name" */ 'Deleted',
+ 'verb' => /* @trans, @context "ticket state action" */ 'Delete'
)
);
@@ -1066,7 +1066,7 @@ class TicketStateField extends ChoiceField {
if (!isset($_choices)) {
// Translate and cache the choices
foreach (static::$_states as $k => $v)
- $_choices[$k] = __($v['name']);
+ $_choices[$k] = _P('ticket state name', $v['name']);
$this->ht['default'] = '';
}
@@ -1080,10 +1080,10 @@ class TicketStateField extends ChoiceField {
$state = key($state);
if (isset(static::$_states[$state]))
- return __(static::$_states[$state]['name']);
+ return _P('ticket state name', static::$_states[$state]['name']);
if (isset(static::$_privatestates[$state]))
- return __(static::$_privatestates[$state]['name']);
+ return _P('ticket state name', static::$_privatestates[$state]['name']);
return $state;
}
@@ -1101,10 +1101,10 @@ class TicketStateField extends ChoiceField {
static function getVerb($state) {
if (isset(static::$_states[$state]))
- return __(static::$_states[$state]['verb']);
+ return _P('ticket state action', static::$_states[$state]['verb']);
if (isset(static::$_privatestates[$state]))
- return __(static::$_privatestates[$state]['verb']);
+ return _P('ticket state action', static::$_privatestates[$state]['verb']);
}
}
FormField::addFieldTypes('Dynamic Fields', function() {
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 60d94cbc7..8e547913a 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -16,7 +16,7 @@ if ($thisclient && $thisclient->isGuest()
<strong><?php echo __('Looking for your other tickets?'); ?></strong></br>
<a href="<?php echo ROOT_PATH; ?>login.php?e=<?php
echo urlencode($thisclient->getEmail());
- ?>" style="text-decoration:underline"><?php echo __('Sign In'); ?></a> or
+ ?>" style="text-decoration:underline"><?php echo __('Sign In'); ?></a>
<?php echo sprintf(__('or %s register for an account %s for the best experience on our help desk.'),
'<a href="account.php?do=create" style="text-decoration:underline">','</a>'); ?>
</div>
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index bb99bc5cc..30efbb4c5 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -114,7 +114,7 @@ $gmtime = Misc::gmtime();
list($desc, $func) = $f;
$selected = ($config['name_format'] == $n) ? 'selected="selected"' : ''; ?>
<option value="<?php echo $n; ?>" <?php echo $selected;
- ?>><?php echo $desc; ?></option>
+ ?>><?php echo __($desc); ?></option>
<?php } ?>
</select>
<i class="help-tip icon-question-sign" href="#default_name_formatting"></i>
--
GitLab