From 62998f8d694bc67c8f90cdc8cfb26bb2b034f15b Mon Sep 17 00:00:00 2001 From: koziolek Date: Fri, 3 Nov 2017 14:53:00 +0100 Subject: [PATCH] Translate hard-coded strings. --- resources/lang/en_US/firefly.php | 8 ++++++++ resources/views/admin/users/show.twig | 14 +++++++------- resources/views/bills/index.twig | 2 +- resources/views/form/location.twig | 3 +-- resources/views/import/bank/form.twig | 4 ++-- resources/views/import/index.twig | 2 +- resources/views/layout/default.twig | 4 ++-- resources/views/list/bills.twig | 2 +- resources/views/list/piggy-bank-events.twig | 2 +- resources/views/rules/index.twig | 2 +- resources/views/transactions/mass/edit.twig | 4 ++-- resources/views/transactions/show.twig | 6 +++--- 12 files changed, 30 insertions(+), 23 deletions(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 4096eff434..0b277062a0 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -355,6 +355,7 @@ return [ 'without_date' => 'Without date', 'result' => 'Result', 'sums_apply_to_range' => 'All sums apply to the selected range', + 'mapbox_api_key' => 'To use map, get an API key from Mapbox. Open your .env file en enter this code after MAPBOX_API_KEY=.', 'press_tag_location' => 'Right click or long press to set the tag\'s location.', 'clear_location' => 'Clear location', @@ -587,6 +588,7 @@ return [ 'not_expected_period' => 'Not expected this period', 'bill_is_active' => 'Bill is active', 'bill_will_automatch' => 'Bill will automatically linked to matching transactions', + 'skips_over' => 'skips over', // accounts: 'details_for_asset' => 'Details for asset account ":name"', 'details_for_expense' => 'Details for expense account ":name"', @@ -615,6 +617,7 @@ return [ 'revenue_accounts' => 'Revenue accounts', 'cash_accounts' => 'Cash accounts', 'Cash account' => 'Cash account', + 'cash' => 'cash', 'account_type' => 'Account type', 'save_transactions_by_moving' => 'Save these transaction(s) by moving them to another account:', 'stored_new_account' => 'New account ":name" stored!', @@ -665,6 +668,7 @@ return [ 'mass_delete_journals' => 'Delete a number of transactions', 'mass_edit_journals' => 'Edit a number of transactions', 'cannot_edit_other_fields' => 'You cannot mass-edit other fields than the ones here, because there is no room to show them. Please follow the link and edit them by one-by-one, if you need to edit these fields.', + 'no_budget' => 'none', 'perm-delete-many' => 'Deleting many items in one go can be very disruptive. Please be cautious.', 'mass_deleted_transactions_success' => 'Deleted :amount transaction(s).', 'mass_edited_transactions_success' => 'Updated :amount transaction(s)', @@ -700,7 +704,9 @@ return [ 'currency' => 'Currency', 'preferences' => 'Preferences', 'logout' => 'Logout', + 'toggleNavigation' => 'Toggle navigation', 'searchPlaceholder' => 'Search...', + 'version' => 'Version', 'dashboard' => 'Dashboard', 'currencies' => 'Currencies', 'accounts' => 'Accounts', @@ -926,6 +932,7 @@ return [ 'budgets_with_limits' => 'budget(s) with configured amount', 'rule_or_rules' => 'rule(s)', 'rulegroup_or_groups' => 'rule group(s)', + 'tag_or_tags' => 'tag(s)', 'configuration_updated' => 'The configuration has been updated', 'setting_is_demo_site' => 'Demo site', 'setting_is_demo_site_explain' => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.', @@ -1013,6 +1020,7 @@ return [ 'import_index_title' => 'Import data into Firefly III', 'import_index_sub_title' => 'Index', 'import_general_index_intro' => 'Welcome to Firefly\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + 'import_general_index_csv_file' => 'Import a (CSV) file', 'import_index_intro' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.', 'import_index_file' => 'Select your file', 'import_index_config' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file.', diff --git a/resources/views/admin/users/show.twig b/resources/views/admin/users/show.twig index 2922ed89ff..b627f4c2f0 100644 --- a/resources/views/admin/users/show.twig +++ b/resources/views/admin/users/show.twig @@ -32,9 +32,9 @@ {{ trans('list.is_admin') }} {% if information.is_admin %} - Yes + {{ 'yes'|_ }} {% else %} - No + {{ 'no'|_ }} {% endif %} @@ -42,9 +42,9 @@ {{ trans('list.has_two_factor') }} {% if information.has_2fa %} - Yes + {{ 'yes'|_ }} {% else %} - No + {{ 'no'|_ }} {% endif %} @@ -52,7 +52,7 @@ {{ trans('list.is_blocked') }} {% if information.blocked %} - Yes: + {{ 'yes'|_ }}: {% if information.blocked_code == "" %} ~ @@ -61,7 +61,7 @@ {% endif %} {% else %} - No + {{ 'no'|_ }} {% endif %} @@ -122,7 +122,7 @@ {{ trans('list.tags_count') }} - {{ information.tags }} tags + {{ information.tags }} {{ 'tag_or_tags'|_ }} diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig index ef136db47f..dcb8603898 100644 --- a/resources/views/bills/index.twig +++ b/resources/views/bills/index.twig @@ -19,7 +19,7 @@
diff --git a/resources/views/form/location.twig b/resources/views/form/location.twig index e4f8b91cae..1f791a31a3 100644 --- a/resources/views/form/location.twig +++ b/resources/views/form/location.twig @@ -3,8 +3,7 @@
{% if env('MAPBOX_API_KEY','') == '' %}

- To use map, get an API key from Mapbox. - Open your .env file en enter this code after MAPBOX_API_KEY=. + {{ trans('mapbox_api_key')|raw }}

{% else %}
diff --git a/resources/views/import/bank/form.twig b/resources/views/import/bank/form.twig index 17bd9ac029..212c481abd 100644 --- a/resources/views/import/bank/form.twig +++ b/resources/views/import/bank/form.twig @@ -25,8 +25,8 @@ - - + + diff --git a/resources/views/import/index.twig b/resources/views/import/index.twig index 1c10f69481..8e2876dc52 100644 --- a/resources/views/import/index.twig +++ b/resources/views/import/index.twig @@ -25,7 +25,7 @@ {# file import #} - Import a (CSV) file + {{ 'import_general_index_csv_file'|_ }} {# bunq import #} {# diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index 9413b94dfc..1c900ad955 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -58,7 +58,7 @@ diff --git a/resources/views/list/piggy-bank-events.twig b/resources/views/list/piggy-bank-events.twig index df71625b69..89b20f1710 100644 --- a/resources/views/list/piggy-bank-events.twig +++ b/resources/views/list/piggy-bank-events.twig @@ -1,7 +1,7 @@
AccountCurrent balance{{ 'list.account'|_ }}{{ 'list.currentBalance'|_ }}
{% if showPiggyBank %} - + {% endif %} diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig index e564d22f84..217d342bab 100644 --- a/resources/views/rules/index.twig +++ b/resources/views/rules/index.twig @@ -119,7 +119,7 @@ {% if rule.active %} {{ rule.title }} {% else %} - {{ rule.title }} (inactive) + {{ rule.title }} ({{ 'inactive'|_|lower }}) {% endif %} {% if rule.stop_processing %} diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig index 67aa4df0c8..8b3f253050 100644 --- a/resources/views/transactions/mass/edit.twig +++ b/resources/views/transactions/mass/edit.twig @@ -108,9 +108,9 @@
Piggy bank{{ trans('list.piggy_bank') }}{{ trans('list.date') }} {{ trans('list.amount') }} {% if journal.transaction_type_type == 'Withdrawal' %} {% if transaction.source_account_type == 'Cash account' %} - (cash) + ({{ 'cash'|_ }}) {% else %} {{ transaction.source_account_name }} {% endif %} @@ -401,7 +401,7 @@ {% if transaction.destination_account_type == 'Cash account' %} - (cash) + ({{ 'cash'|_ }}) {% else %} {{ transaction.destination_account_name }} {% endif %} @@ -478,7 +478,7 @@
- +