kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 17:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Finished migration to use gettext (this now closes #161)

Browse Source
This commit is contained in:
Bernd Bestel
2019-05-02 20:20:18 +02:00
parent 5d3f248d94
commit 4912dd56d1
75 changed files with 2275 additions and 1581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/BaseController.php
View File

@@ -40,7 +40,7 @@ class BaseController
{
return $localizationService->__n($number, $singularForm, $pluralForm);
});
$container->view->set('jsGettextTranslatorStrings', $localizationService->GetTranslationsForJavaScriptTranslator());
$container->view->set('GettextPo', $localizationService->GetPoAsJsonString());
$container->view->set('U', function($relativePath, $isResource = false) use($container)
{

2
controllers/RecipesController.php
View File

@@ -72,7 +72,7 @@ class RecipesController extends BaseController
if ($recipeId == 'new')
{
$newRecipe = $this->Database->recipes()->createRow(array(
'name' => $this->LocalizationService-Translator->__t('New recipe')
'name' => $this->LocalizationService->__t('New recipe')
));
$newRecipe->save();

8
controllers/StockController.php
View File

@@ -199,7 +199,9 @@ class StockController extends BaseController
{
return $this->AppContainer->view->render($response, 'quantityunitform', [
'mode' => 'create',
'userfields' => $this->UserfieldsService->GetFields('quantity_units')
'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
'pluralCount' => $this->LocalizationService->GetPluralCount(),
'pluralRule' => $this->LocalizationService->GetPluralDefinition()
]);
}
else
@@ -207,7 +209,9 @@ class StockController extends BaseController
return $this->AppContainer->view->render($response, 'quantityunitform', [
'quantityunit' => $this->Database->quantity_units($args['quantityunitId']),
'mode' => 'edit',
'userfields' => $this->UserfieldsService->GetFields('quantity_units')
'userfields' => $this->UserfieldsService->GetFields('quantity_units'),
'pluralCount' => $this->LocalizationService->GetPluralCount(),
'pluralRule' => $this->LocalizationService->GetPluralDefinition()
]);
}
}

2
controllers/SystemApiController.php
View File

@@ -32,7 +32,7 @@ class SystemApiController extends BaseApiController
{
$requestBody = $request->getParsedBody();
$this->LocalizationService->LogMissingLocalization(GROCY_CULTURE, $requestBody['text']);
$this->LocalizationService->CheckAndAddMissingTranslationToPot($requestBody['text']);
return $this->EmptyApiResponse($response);
}
catch (\Exception $ex)