From ba378ea00b36f5a13ff20f0e869a65de153cf791 Mon Sep 17 00:00:00 2001 From: Ryan Fletcher Date: Wed, 11 Jul 2018 15:00:08 -0400 Subject: [PATCH] First attempt at using l10n Signed-off-by: Ryan Fletcher --- l10n/en_GB.js | 4 +++- l10n/en_GB.json | 4 +++- lib/Controller/PageController.php | 10 ++++++--- lib/Service/DefaultBoardService.php | 22 +++++++++++-------- .../unit/Service/DefaultBoardServiceTest.php | 9 ++++++++ 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/l10n/en_GB.js b/l10n/en_GB.js index 8266fb71c..d1d628190 100644 --- a/l10n/en_GB.js +++ b/l10n/en_GB.js @@ -74,6 +74,8 @@ OC.L10N.register( "Shared boards" : "Shared boards", "View more" : "View more", "Move board to archive" : "Move board to archive", - "Create a new board" : "Create a new board" + "Create a new board" : "Create a new board", + "Personal": "Personal", + "To do": "To do" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/en_GB.json b/l10n/en_GB.json index c394f0559..1dde03650 100644 --- a/l10n/en_GB.json +++ b/l10n/en_GB.json @@ -72,6 +72,8 @@ "Shared boards" : "Shared boards", "View more" : "View more", "Move board to archive" : "Move board to archive", - "Create a new board" : "Create a new board" + "Create a new board" : "Create a new board", + "Personal": "Personal", + "To do": "To do" },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 0f5234bd4..42603a232 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -27,22 +27,26 @@ use OCA\Deck\Service\DefaultBoardService; use OCP\IRequest; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Controller; +use OCP\IL10N; class PageController extends Controller { private $defaultBoardService; private $userId; + private $l10n; public function __construct( $AppName, - IRequest $request, + IRequest $request, DefaultBoardService $defaultBoardService, + IL10N $l10n, $userId ) { parent::__construct($AppName, $request); $this->userId = $userId; $this->defaultBoardService = $defaultBoardService; + $this->l10n = $l10n; } /** @@ -57,9 +61,9 @@ class PageController extends Controller { 'user' => $this->userId, 'maxUploadSize' => \OCP\Util::uploadLimit(), ]; - + if ($this->defaultBoardService->checkFirstRun($this->userId, $this->appName)) { - $this->defaultBoardService->createDefaultBoard('Personal', $this->userId, '000000'); + $this->defaultBoardService->createDefaultBoard($this->l10n->t('Personal'), $this->userId, '000000'); } return new TemplateResponse('deck', 'main', $params); diff --git a/lib/Service/DefaultBoardService.php b/lib/Service/DefaultBoardService.php index 30edf1372..8f3a7cdf9 100644 --- a/lib/Service/DefaultBoardService.php +++ b/lib/Service/DefaultBoardService.php @@ -28,6 +28,7 @@ use OCA\Deck\Service\BoardService; use OCA\Deck\Service\StackService; use OCA\Deck\Service\CardService; use OCP\IConfig; +use OCP\IL10N; class DefaultBoardService { @@ -36,8 +37,10 @@ class DefaultBoardService { private $stackService; private $cardService; private $config; + private $l10n; public function __construct( + IL10N $l10n, BoardMapper $boardMapper, BoardService $boardService, StackService $stackService, @@ -50,6 +53,7 @@ class DefaultBoardService { $this->cardService = $cardService; $this->config = $config; $this->boardMapper = $boardMapper; + $this->l10n = $l10n; } public function checkFirstRun($userId, $appName) { @@ -69,16 +73,16 @@ class DefaultBoardService { $defaultStacks = []; $defaultCards = []; - $boardId = $defaultBoard->getId(); - - $defaultStacks[] = $this->stackService->create('To do', $boardId, 1); - $defaultStacks[] = $this->stackService->create('Doing', $boardId, 1); - $defaultStacks[] = $this->stackService->create('Done', $boardId, 1); + $boardId = $defaultBoard->getId(); + + $defaultStacks[] = $this->stackService->create($this->l10n->t('To do'), $boardId, 1); + $defaultStacks[] = $this->stackService->create($this->l10n->t('Doing'), $boardId, 1); + $defaultStacks[] = $this->stackService->create($this->l10n->t('Done'), $boardId, 1); - $defaultCards[] = $this->cardService->create('Example Task 3', $defaultStacks[0]->getId(), 'text', 0, $userId); - $defaultCards[] = $this->cardService->create('Example Task 2', $defaultStacks[1]->getId(), 'text', 0, $userId); - $defaultCards[] = $this->cardService->create('Example Task 1', $defaultStacks[2]->getId(), 'text', 0, $userId); + $defaultCards[] = $this->cardService->create($this->l10n->t('Example Task 3'), $defaultStacks[0]->getId(), 'text', 0, $userId); + $defaultCards[] = $this->cardService->create($this->l10n->t('Example Task 2'), $defaultStacks[1]->getId(), 'text', 0, $userId); + $defaultCards[] = $this->cardService->create($this->l10n->t('Example Task 1'), $defaultStacks[2]->getId(), 'text', 0, $userId); return $defaultBoard; - } + } } \ No newline at end of file diff --git a/tests/unit/Service/DefaultBoardServiceTest.php b/tests/unit/Service/DefaultBoardServiceTest.php index ac00ea631..dcac93ca8 100644 --- a/tests/unit/Service/DefaultBoardServiceTest.php +++ b/tests/unit/Service/DefaultBoardServiceTest.php @@ -32,6 +32,7 @@ use OCA\Deck\Service\BoardService; use OCA\Deck\Service\StackService; use OCA\Deck\Service\CardService; use OCP\IConfig; +use OCP\IL10N; use \Test\TestCase; class DefaultBoardServiceTest extends TestCase { @@ -53,6 +54,8 @@ class DefaultBoardServiceTest extends TestCase { /** @var IConfig */ private $config; + + private $l10n; private $userId = 'admin'; @@ -63,8 +66,14 @@ class DefaultBoardServiceTest extends TestCase { $this->stackService = $this->createMock(StackService::class); $this->cardService = $this->createMock(CardService::class); $this->config = $this->createMock(IConfig::class); + + $this->l10n = $this->request = $this->getMockBuilder( + '\OCP\IL10n') + ->disableOriginalConstructor() + ->getMock(); $this->service = new DefaultBoardService( + $this->l10n, $this->boardMapper, $this->boardService, $this->stackService,