Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add L10N support #583

Merged
merged 1 commit into from
Jul 28, 2016
Merged

Add L10N support #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions apps/workflowengine/lib/Check/UserGroupMembership.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

use OCP\Files\Storage\IStorage;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IUser;
use OCP\IUserSession;
use OCP\WorkflowEngine\ICheck;
Expand All @@ -42,13 +43,18 @@ class UserGroupMembership implements ICheck {
/** @var IGroupManager */
protected $groupManager;

/** @var IL10N */
protected $l;

/**
* @param IUserSession $userSession
* @param IGroupManager $groupManager
* @param IL10N $l
*/
public function __construct(IUserSession $userSession, IGroupManager $groupManager) {
public function __construct(IUserSession $userSession, IGroupManager $groupManager, IL10N $l) {
$this->userSession = $userSession;
$this->groupManager = $groupManager;
$this->l = $l;
}

/**
Expand Down Expand Up @@ -83,11 +89,11 @@ public function executeCheck($operator, $value) {
*/
public function validateCheck($operator, $value) {
if (!in_array($operator, ['is', '!is'])) {
throw new \UnexpectedValueException('Invalid operator', 1);
throw new \UnexpectedValueException($this->l->t('Operator %s is invalid', $operator), 1);
}

if (!$this->groupManager->groupExists($value)) {
throw new \UnexpectedValueException('Group does not exist', 2);
throw new \UnexpectedValueException($this->l->t('Group %s does not exist', $value), 2);
}
}

Expand Down
14 changes: 10 additions & 4 deletions apps/workflowengine/lib/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Storage\IStorage;
use OCP\IDBConnection;
use OCP\IL10N;
use OCP\IServerContainer;
use OCP\WorkflowEngine\ICheck;
use OCP\WorkflowEngine\IManager;
Expand All @@ -50,13 +51,18 @@ class Manager implements IManager {
/** @var IServerContainer|\OC\Server */
protected $container;

/** @var IL10N */
protected $l;

/**
* @param IDBConnection $connection
* @param IServerContainer $container
* @param IL10N $l
*/
public function __construct(IDBConnection $connection, IServerContainer $container) {
public function __construct(IDBConnection $connection, IServerContainer $container, IL10N $l) {
$this->connection = $connection;
$this->container = $container;
$this->l = $l;
}

/**
Expand Down Expand Up @@ -111,7 +117,7 @@ protected function check(array $check) {
return $checkInstance->executeCheck($check['operator'], $check['value']);
} else {
// Check is invalid
throw new \RuntimeException('Check ' . htmlspecialchars($check['class']) . ' is invalid or does not exist');
throw new \UnexpectedValueException($this->l->t('Check %s is invalid or does not exist', $check['class']));
}
}

Expand Down Expand Up @@ -158,7 +164,7 @@ protected function getOperation($id) {
return $row;
}

throw new \UnexpectedValueException('Operation does not exist');
throw new \UnexpectedValueException($this->l->t('Operation #%s does not exist', $id));
}

/**
Expand Down Expand Up @@ -262,7 +268,7 @@ public function getChecks(array $checkIds) {

if (!empty($checkIds)) {
$missingCheck = array_pop($checkIds);
throw new \RuntimeException('Check #' . htmlspecialchars($missingCheck) . ' is invalid or does not exist');
throw new \UnexpectedValueException($this->l->t('Check #%s does not exist', $missingCheck));
}

return $checks;
Expand Down
14 changes: 7 additions & 7 deletions apps/workflowengine/templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
*/

/** @var array $_ */
/** @var OC_L10N $l */
/** @var \OCP\IL10N $l */
?>
<div id="<?php p($_['appid']); ?>" class="section workflowengine">
<h2 class="inlineblock"><?php p($_['heading']); ?></h2>
<script type="text/template" id="operations-template">
<div class="operations"></div>
<button class="button-add-operation">Add operation</button>
<button class="button-add-operation"><?php p($l->t('Add operation')); ?></button>
</script>

<script type="text/template" id="operation-template">
Expand Down Expand Up @@ -56,17 +56,17 @@
</div>
{{/each}}
</div>
<button class="button-add">Add check</button>
<button class="button-add"><?php p($l->t('Add check')); ?></button>
{{#if hasChanged}}
{{! reset only makes sense if the operation is already saved }}
{{#if operation.id}}
<button class="button-reset pull-right">Reset</button>
<button class="button-reset pull-right"><?php p($l->t('Reset')); ?></button>
{{/if}}
<button class="button-save pull-right">Save</button>
<button class="button-save pull-right"><?php p($l->t('Save')); ?></button>
{{/if}}
{{#if saving}}
<span class="icon-loading-small pull-right"></span>
<span class="pull-right">Saving ...</span>
<span class="pull-right"><?php p($l->t('Saving…')); ?></span>
{{else}}{{#if message}}
<span class="msg pull-right {{#if errorMessage}}error{{else}}success{{/if}}">
{{message}}{{#if errorMessage}} {{errorMessage}}{{/if}}
Expand All @@ -75,5 +75,5 @@
</div>
</script>

<div class="rules"><span class="icon-loading-small"></span> Loading ...</div>
<div class="rules"><span class="icon-loading-small"></span> <?php p($l->t('Loading…')); ?></div>
</div>