From 031b9cdbe68bb02bfbea5c6c9ed9fd6289c25469 Mon Sep 17 00:00:00 2001 From: Kuba Date: Wed, 21 Oct 2015 19:39:16 +0200 Subject: [PATCH] translation strings in import-export behaviour and polish translations --- .../partials/_column_sample_form.htm | 16 +- .../partials/_export_form.htm | 66 ++++---- .../partials/_export_result_form.htm | 40 ++--- .../partials/_import_file_columns.htm | 48 +++--- .../partials/_import_form.htm | 66 ++++---- .../partials/_import_result_form.htm | 158 +++++++++--------- .../partials/_import_toolbar.htm | 20 +-- .../partials/fields_export.yaml | 20 +-- .../partials/fields_import.yaml | 16 +- modules/backend/lang/en/lang.php | 42 ++++- modules/backend/lang/pl/lang.php | 42 ++++- 11 files changed, 307 insertions(+), 227 deletions(-) diff --git a/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm index 21a870be3..c13965604 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm @@ -1,10 +1,10 @@
-

Column preview

+

- Column: + :

@@ -12,9 +12,9 @@
    -
  • - -
    • +
  • + +
@@ -23,9 +23,9 @@
\ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm index 2cd6aa806..f9852c90a 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm @@ -1,51 +1,51 @@
fatalError): ?> - 'exportForm']) ?> -
-

Export progress

-
+ 'exportForm']) ?> +
+

+
-
-
- -
-

 

-
-
Processing
- -
-
-

 

+
+
+
+

 

+
+
+
+

 

- +
+
- + + + -
- -

Export error

-
-
-

fatalError) ?>

-
-
- +

+
+
+

fatalError) ?>

+
+
+ -
+ + +
\ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm index fffaf040e..814b4e3a0 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_export_result_form.htm @@ -1,34 +1,34 @@ fatalError): ?> -
-

- File export process has completed successfully! - The browser should now redirect automatically to the file download. -

-
-
- +

+ + +

+
+
+ - - -
+ + +
- + -
-

fatalError) ?>

-
-
-
+
+ -
+ + + \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm index 9af030c13..45a871aa3 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm @@ -1,41 +1,41 @@
- -

- Please upload a valid CSV file. -

+

+ . +

diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm index 9fbf1ba90..94e363fc5 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm @@ -1,51 +1,51 @@
fatalError): ?> - 'importForm']) ?> -
-

Import progress

-
+ 'importForm']) ?> +
+

+
-
-
- -
-

 

-
-
Processing
- -
-
-

 

+
+
+
+

 

+
+
+
+

 

- +
+
- + + + -
- -

Import error

-
-
-

fatalError) ?>

-
-
- +

+
+
+

fatalError) ?>

+
+
+ -
+ + +
\ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm index 1ddacdd9a..d577a62a6 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_result_form.htm @@ -1,102 +1,102 @@ fatalError): ?> -
+
-
-
-
-

Created

-

created ?>

-
-
-

Updated

-

updated ?>

-
- skippedCount): ?> -
-

Skipped

-

skippedCount ?>

-
- - warningCount): ?> -
-

Warnings

-

warningCount ?>

-
- -
-

Errors

-

errorCount ?>

-
+
+
+
+

+

created ?>

+
+
+

+

updated ?>

+
+ skippedCount): ?> +
+

+

skippedCount ?>

+
+ + warningCount): ?> +
+

+

warningCount ?>

+
+ +
+

+

errorCount ?>

+
- hasMessages): ?> - hasMessages): ?> + 'Skipped rows', - 'warnings' => 'Warnings', - 'errors' => 'Errors', + 'skipped' => trans('backend::lang.import_export.skipped_rows'), + 'warnings' => trans('backend::lang.import_export.warnings'), + 'errors' => trans('backend::lang.import_export.errors'), ]; - if (!$importResults->skippedCount) unset($tabs['skipped']); - if (!$importResults->warningCount) unset($tabs['warnings']); - if (!$importResults->errorCount) unset($tabs['errors']); - ?> -
-
    - $tab): ?> -
  • - - - -
    • - -
-
- $tab): ?> -
-
-
-
    - {$code} as $row => $message): ?> -
  • - Row - - -
    • - -
-
-
-
- + if (!$importResults->skippedCount) unset($tabs['skipped']); + if (!$importResults->warningCount) unset($tabs['warnings']); + if (!$importResults->errorCount) unset($tabs['errors']); + ?> +
+
    + $tab): ?> +
  • + + + +
    • + +
+
+ $tab): ?> +
+
+
+
    + {$code} as $row => $message): ?> +
  • + Row + - +
    • + +
+
- - - + +
-
- + +
+
+ - - -
+ + +
-
-

fatalError) ?>

-
-
-
+
+ -
+ + +
\ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm index 0cf45837f..f7b86daa5 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm @@ -1,16 +1,16 @@ \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/fields_export.yaml b/modules/backend/behaviors/importexportcontroller/partials/fields_export.yaml index 81dfba5ac..e12e02749 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/fields_export.yaml +++ b/modules/backend/behaviors/importexportcontroller/partials/fields_export.yaml @@ -4,20 +4,20 @@ fields: step1_section: - label: 1. Export output format + label: backend::lang.import_export.export_output_format type: section format_preset: - label: File format + label: backend::lang.import_export.file_format type: dropdown default: standard options: - standard: Standard format - custom: Custom format + standard: backend::lang.import_export.standard_format + custom: backend::lang.import_export.custom_format span: left format_delimiter: - label: Delimiter character + label: backend::lang.import_export.delimiter_char default: ',' span: left trigger: @@ -26,7 +26,7 @@ fields: field: format_preset format_enclosure: - label: Enclosure character + label: backend::lang.import_export.enclosure_char span: auto default: '"' trigger: @@ -35,7 +35,7 @@ fields: field: format_preset format_escape: - label: Escape character + label: backend::lang.import_export.escape_char span: auto default: '\\' trigger: @@ -44,15 +44,15 @@ fields: field: format_preset step2_section: - label: 2. Select columns to export + label: backend::lang.import_export.select_columns type: section export_columns: - label: Columns + label: backend::lang.import_export.columns type: partial path: ~/modules/backend/behaviors/importexportcontroller/partials/_export_columns.htm span: left step3_section: - label: 3. Set export options + label: backend::lang.import_export.set_export_options type: section \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/fields_import.yaml b/modules/backend/behaviors/importexportcontroller/partials/fields_import.yaml index c7156fbb9..da4dbcf02 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/fields_import.yaml +++ b/modules/backend/behaviors/importexportcontroller/partials/fields_import.yaml @@ -4,11 +4,11 @@ fields: step1_section: - label: 1. Upload a CSV file + label: backend::lang.import_export.upload_csv_file type: section import_file: - label: Import file + label: backend::lang.import_export.import_file type: fileupload mode: file span: left @@ -16,14 +16,14 @@ fields: useCaption: false first_row_titles: - label: First row contains column titles - comment: Leave this checked if the first row in the CSV is used as the column titles. + label: backend::lang.import_export.first_row_contains_titles + comment: backend::lang.import_export.first_row_contains_titles_desc type: checkbox default: true span: left step2_section: - label: 2. Match the file columns to database fields + label: backend::lang.import_export.match_columns type: section column_control_panel: @@ -31,19 +31,19 @@ fields: path: ~/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm import_file_columns: - label: File columns + label: backend::lang.import_export.file_columns type: partial path: ~/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm dependsOn: [import_file, first_row_titles] span: left import_db_columns: - label: Database fields + label: backend::lang.import_export.database_fields type: partial path: ~/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm dependsOn: [import_file, first_row_titles] span: right step3_section: - label: 3. Set import options + label: backend::lang.import_export.set_import_options type: section \ No newline at end of file diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 43eb83299..01c4a1c67 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -321,5 +321,45 @@ return [ ], 'filter' => [ 'all' => 'all' - ] + ], + 'import_export' => [ + 'upload_csv_file' => '1. Upload a CSV file', + 'import_file' => 'Import file', + 'first_row_contains_titles' => 'First row contains column titles', + 'first_row_contains_titles_desc' => 'Leave this checked if the first row in the CSV is used as the column titles.', + 'match_columns' => '2. Match the file columns to database fields', + 'file_columns' => 'File columns', + 'database_fields' => 'Database fields', + 'set_import_options' => '3. Set import options', + 'export_output_format' => '1. Export output format', + 'file_format' => 'File format', + 'standard_format' => 'Standard format', + 'custom_format' => 'Custom format', + 'delimiter_char' => 'Delimiter character', + 'enclosure_char' => 'Enclosure character', + 'escape_char' => 'Escape character', + 'select_columns' => '2. Select columns to export', + 'column' => 'Column', + 'columns' => 'Columns', + 'set_export_options' => '3. Set export options', + 'show_ignored_columns' => 'Show ignored columns', + 'auto_match_columns' => 'Auto match columns', + 'created' => 'Created', + 'updated' => 'Updated', + 'skipped' => 'Skipped', + 'warnings' => 'Warnings', + 'errors' => 'Errors', + 'skipped_rows' => 'Skipped Rows', + 'import_progress' => 'Import progress', + 'processing' => 'Processing', + 'import_error' => 'Import error', + 'upload_valid_csv' => 'Please upload a valid CSV file.', + 'drop_column_here' => 'Drop column here...', + 'ignore_this_column' => 'Ignore this column', + 'processing_successful_line1' => 'File export process has completed successfully!', + 'processing_successful_line2' => 'The browser should now redirect automatically to the file download.', + 'export_progress' => 'Export progress', + 'export_error' => 'Export error', + 'column_preview' => 'Column preview', + ], ]; diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php index 8fdd8e6f5..355661e8c 100644 --- a/modules/backend/lang/pl/lang.php +++ b/modules/backend/lang/pl/lang.php @@ -313,5 +313,45 @@ return [ ], 'filter' => [ 'all' => 'wszystkie' - ] + ], + 'import_export' => [ + 'upload_csv_file' => '1. Wgraj plik CSV', + 'import_file' => 'Importuj Plik', + 'first_row_contains_titles' => 'Pierwszy wiersz zawiera nazwy kolumn', + 'first_row_contains_titles_desc' => 'Zostaw to pole zaznaczone, jeżeli pierwszy wiersz w pliku CSV zawiera tytuły kolumn.', + 'match_columns' => '2. Przypisz kolumny z pliku do pól w bazie danych', + 'file_columns' => 'Kolumny w pliku', + 'database_fields' => 'Pola w bazie', + 'set_import_options' => '3. Ustaw opcje importu', + 'export_output_format' => '1. Format eksportowanego pliku', + 'file_format' => 'Format pliku', + 'standard_format' => 'Standardowy', + 'custom_format' => 'Niestandardowy', + 'delimiter_char' => 'Znak rozdzielający (delimiter)', + 'enclosure_char' => 'Znak zawierający (enclosure)', + 'escape_char' => 'Znak unikania (escape)', + 'select_columns' => '2. Wybierz kolumny do eksportu', + 'column' => 'Kolumna', + 'columns' => 'Kolumny', + 'set_export_options' => '3. Ustaw opcje eksportu', + 'show_ignored_columns' => 'Pokaż ignorowane kolumny', + 'auto_match_columns' => 'Automatycznie przypisz kolumny', + 'created' => 'Stworzono', + 'updated' => 'Zaktualizowano', + 'skipped' => 'Pominięto', + 'warnings' => 'Ostrzeżenia', + 'errors' => 'Błędy', + 'skipped_rows' => 'Pominięte wiersze', + 'import_progress' => 'Postęp importu', + 'processing' => 'Przetwarzanie', + 'import_error' => 'Błąd importu', + 'upload_valid_csv' => 'Wgraj prawidłowy plik CSV.', + 'drop_column_here' => 'Upuść kolumnę tutaj...', + 'ignore_this_column' => 'Ignoruj tą kolumnę', + 'processing_successful_line1' => 'Procedura eksportu zakończyła się powodzeniem!', + 'processing_successful_line2' => 'Przeglądarka automatycznie zaproponuje Ci pobranie pliku.', + 'export_progress' => 'Postęp eksportu', + 'export_error' => 'Błąd eksportu', + 'column_preview' => 'Podgląd kolumny', + ], ];