diff --git a/src/mibew/libs/classes/Mibew/Controller/Localization/AbstractController.php b/src/mibew/libs/classes/Mibew/Controller/Localization/AbstractController.php index 4fde65a2..2fe20b5e 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Localization/AbstractController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Localization/AbstractController.php @@ -41,10 +41,10 @@ abstract class AbstractController extends BaseAbstractController ? $this->generateUrl('translations') : ''; - $import = $route == 'translations_import' - || $route == 'translations_import_process'; + $import = $route == 'translation_import' + || $route == 'translation_import_process'; $tabs[getlocal('Translations import')] = !$import - ? $this->generateUrl('translations_import') + ? $this->generateUrl('translation_import') : ''; $tabs[getlocal('Locales')] = ($route != 'locales') diff --git a/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationsImportController.php b/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationImportController.php similarity index 94% rename from src/mibew/libs/classes/Mibew/Controller/Localization/TranslationsImportController.php rename to src/mibew/libs/classes/Mibew/Controller/Localization/TranslationImportController.php index 32334974..6d7c823a 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationsImportController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Localization/TranslationImportController.php @@ -23,7 +23,7 @@ use Symfony\Component\HttpFoundation\Request; /** * Contains actions for all translations import functionality. */ -class TranslationsImportController extends AbstractController +class TranslationImportController extends AbstractController { /** * Builds a page with form for upload translation file. @@ -65,12 +65,12 @@ class TranslationsImportController extends AbstractController $page = array_merge($page, prepare_menu($operator)); $page['tabs'] = $this->buildTabs($request); - return $this->render('translations_import', $page); + return $this->render('translation_import', $page); } /** * Processes submitting of the form which is generated in - * {@link \Mibew\Controller\TranslationsImportController::showFormAction()} + * {@link \Mibew\Controller\TranslationImportController::showFormAction()} * method. * * @param Request $request Incoming request. @@ -125,7 +125,7 @@ class TranslationsImportController extends AbstractController // Redirect the operator to the same page using GET method. $redirect_to = $this->generateUrl( - 'translations_import', + 'translation_import', array('stored' => true) ); return $this->redirect($redirect_to); diff --git a/src/mibew/libs/routing.yml b/src/mibew/libs/routing.yml index 62f272bf..7c326a43 100644 --- a/src/mibew/libs/routing.yml +++ b/src/mibew/libs/routing.yml @@ -631,6 +631,22 @@ translation_edit_save: string_id: "\d{1,10}" methods: [POST] +translation_import: + path: /operator/translation/import + defaults: + _controller: Mibew\Controller\Localization\TranslationImportController::showFormAction + _access_check: Mibew\AccessControl\Check\PermissionsCheck + _access_permissions: [CAN_ADMINISTRATE] + methods: [GET] + +translation_import_process: + path: /operator/translation/import + defaults: + _controller: Mibew\Controller\Localization\TranslationImportController::submitFormAction + _access_check: Mibew\AccessControl\Check\PermissionsCheck + _access_permissions: [CAN_ADMINISTRATE] + methods: [POST] + translations: path: /operator/translation defaults: @@ -638,22 +654,6 @@ translations: _access_check: Mibew\AccessControl\Check\PermissionsCheck _access_permissions: [CAN_ADMINISTRATE] -translations_import: - path: /operator/translation/import - defaults: - _controller: Mibew\Controller\Localization\TranslationsImportController::showFormAction - _access_check: Mibew\AccessControl\Check\PermissionsCheck - _access_permissions: [CAN_ADMINISTRATE] - methods: [GET] - -translations_import_process: - path: /operator/translation/import - defaults: - _controller: Mibew\Controller\Localization\TranslationsImportController::submitFormAction - _access_check: Mibew\AccessControl\Check\PermissionsCheck - _access_permissions: [CAN_ADMINISTRATE] - methods: [POST] - ## Updates updates: path: /operator/updates diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translations_import.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translation_import.handlebars similarity index 100% rename from src/mibew/styles/pages/default/templates_src/server_side/translations_import.handlebars rename to src/mibew/styles/pages/default/templates_src/server_side/translation_import.handlebars