From 17c8be37f5a2318bb454f7b6d5c7db7f8bf19b6a Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 27 Jan 2020 19:33:58 +0100 Subject: [PATCH] Update language configuration. --- config/firefly.php | 204 +++++++++++++++------------- resources/lang/.gitignore | 2 + resources/lang/fr_FR/config.php | 2 +- resources/lang/fr_FR/validation.php | 6 +- resources/lang/it_IT/config.php | 2 +- 5 files changed, 113 insertions(+), 103 deletions(-) diff --git a/config/firefly.php b/config/firefly.php index 3a3da8e009..7b0f737f8b 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -128,43 +128,43 @@ use FireflyIII\User; */ return [ - 'configuration' => [ + 'configuration' => [ 'single_user_mode' => true, 'is_demo_site' => false, ], - 'feature_flags' => [ + 'feature_flags' => [ 'export' => true, ], - 'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'), - 'version' => '5.0.1', - 'api_version' => '1.0.0', - 'db_version' => 12, - 'maxUploadSize' => 15242880, - 'send_error_message' => env('SEND_ERROR_MESSAGE', true), - 'site_owner' => env('SITE_OWNER', ''), - 'send_registration_mail' => env('SEND_REGISTRATION_MAIL', true), - 'demo_username' => env('DEMO_USERNAME', ''), - 'demo_password' => env('DEMO_PASSWORD', ''), - 'is_sandstorm' => env('IS_SANDSTORM', 'unknown'), - 'bunq_use_sandbox' => env('BUNQ_USE_SANDBOX', false), - 'fixer_api_key' => env('FIXER_API_KEY', ''), - 'mapbox_api_key' => env('MAPBOX_API_KEY', ''), - 'trusted_proxies' => env('TRUSTED_PROXIES', ''), - 'search_result_limit' => env('SEARCH_RESULT_LIMIT', 50), - 'send_report_journals' => envNonEmpty('SEND_REPORT_JOURNALS', true), - 'tracker_site_id' => env('TRACKER_SITE_ID', ''), - 'tracker_url' => env('TRACKER_URL', ''), - 'disable_frame_header' => env('DISABLE_FRAME_HEADER', false), - 'disable_csp_header' => env('DISABLE_CSP_HEADER', false), - 'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), - 'cer_provider' => envNonEmpty('CER_PROVIDER', 'fixer'), - 'update_endpoint' => 'https://version.firefly-iii.org/index.json', - 'default_location' => [ + 'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'), + 'version' => '5.0.1', + 'api_version' => '1.0.0', + 'db_version' => 12, + 'maxUploadSize' => 15242880, + 'send_error_message' => env('SEND_ERROR_MESSAGE', true), + 'site_owner' => env('SITE_OWNER', ''), + 'send_registration_mail' => env('SEND_REGISTRATION_MAIL', true), + 'demo_username' => env('DEMO_USERNAME', ''), + 'demo_password' => env('DEMO_PASSWORD', ''), + 'is_sandstorm' => env('IS_SANDSTORM', 'unknown'), + 'bunq_use_sandbox' => env('BUNQ_USE_SANDBOX', false), + 'fixer_api_key' => env('FIXER_API_KEY', ''), + 'mapbox_api_key' => env('MAPBOX_API_KEY', ''), + 'trusted_proxies' => env('TRUSTED_PROXIES', ''), + 'search_result_limit' => env('SEARCH_RESULT_LIMIT', 50), + 'send_report_journals' => envNonEmpty('SEND_REPORT_JOURNALS', true), + 'tracker_site_id' => env('TRACKER_SITE_ID', ''), + 'tracker_url' => env('TRACKER_URL', ''), + 'disable_frame_header' => env('DISABLE_FRAME_HEADER', false), + 'disable_csp_header' => env('DISABLE_CSP_HEADER', false), + 'login_provider' => envNonEmpty('LOGIN_PROVIDER', 'eloquent'), + 'cer_provider' => envNonEmpty('CER_PROVIDER', 'fixer'), + 'update_endpoint' => 'https://version.firefly-iii.org/index.json', + 'default_location' => [ 'longitude' => env('MAP_DEFAULT_LONG', '5.916667'), 'latitude' => env('MAP_DEFAULT_LAT', '51.983333'), 'zoom_level' => env('MAP_DEFAULT_ZOOM', '6'), ], - 'allowedMimes' => [ + 'allowedMimes' => [ /* plain files */ 'text/plain', @@ -308,36 +308,44 @@ return [ 'Debt' => 'debt', 'Mortgage' => 'mortgage', ], + /** + * Languages configuration + */ 'languages' => [ - 'en_US' => ['name_locale' => 'English', 'name_english' => 'English'], - 'cs_CZ' => ['name_locale' => 'Czech', 'name_english' => 'Czech'], - 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'], - 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German'], - 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French'], - 'it_IT' => ['name_locale' => 'Italiano', 'name_english' => 'Italian'], - 'nb_NO' => ['name_locale' => 'Norsk', 'name_english' => 'Norwegian'], - 'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'], - 'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '], - 'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'], - 'ro_RO' => ['name_locale' => 'Română', 'name_english' => 'Romanian'], - 'ru_RU' => ['name_locale' => 'Русский', 'name_english' => 'Russian'], - 'zh_TW' => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'], - 'zh_CN' => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'], - 'hu_HU' => ['name_locale' => 'Hungarian', 'name_english' => 'Hungarian'], - 'sv_SE' => ['name_locale' => 'Svenska', 'name_english' => 'Swedish'], - //'el_GR' => ['name_locale' => 'Ελληνικά', 'name_english' => 'Greek'], // dropped to 65% - - //'id_ID' => ['name_locale' => 'Bahasa Indonesia', 'name_english' => 'Indonesian'], - //'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'], // 71% - //'ca_ES' => ['name_locale' => 'Catalan', 'name_english' => 'Catalan'], // 0% - //'ja_JA' => ['name_locale' => 'Japanese', 'name_english' => 'Japanese'], // 0% - //'he_IL' => ['name_locale' => 'Hebrew', 'name_english' => 'Hebrew'], // 2% - // - //'sr_CS' => ['name_locale' => 'Serbian (Latin)', 'name_english' => 'Serbian (Latin)'], // 0% - //'sl_SI' => ['name_locale' => 'Slovenian', 'name_english' => 'Slovenian'], // 10% - //'uk_UA' => ['name_locale' => 'Ukranian', 'name_english' => 'Ukranian'], // 4% - + // currently enabled languages + 'en_US' => ['name_locale' => 'English', 'name_english' => 'English'], + 'cs_CZ' => ['name_locale' => 'Czech', 'name_english' => 'Czech'], + 'es_ES' => ['name_locale' => 'Español', 'name_english' => 'Spanish'], + 'de_DE' => ['name_locale' => 'Deutsch', 'name_english' => 'German'], + 'fr_FR' => ['name_locale' => 'Français', 'name_english' => 'French'], + 'it_IT' => ['name_locale' => 'Italiano', 'name_english' => 'Italian'], + 'nb_NO' => ['name_locale' => 'Norsk', 'name_english' => 'Norwegian'], + 'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'], + 'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '], + 'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'], + 'ro_RO' => ['name_locale' => 'Română', 'name_english' => 'Romanian'], + 'ru_RU' => ['name_locale' => 'Русский', 'name_english' => 'Russian'], + 'zh_TW' => ['name_locale' => 'Chinese Traditional', 'name_english' => 'Chinese Traditional'], + 'zh_CN' => ['name_locale' => 'Chinese Simplified', 'name_english' => 'Chinese Simplified'], + 'hu_HU' => ['name_locale' => 'Hungarian', 'name_english' => 'Hungarian'], + 'sv_SE' => ['name_locale' => 'Svenska', 'name_english' => 'Swedish'], + // currently disabled languages: + // 'bg_BG' => ['name_locale' => 'Bulgarian', 'name_english' => 'Bulgarian'], + // 'ca_ES' => ['name_locale' => 'Catalan', 'name_english' => 'Catalan'], + // 'da_DK' => ['name_locale' => 'Danish', 'name_english' => 'Danish'], + // 'et_EE' => ['name_locale' => 'Estonian', 'name_english' => 'Estonian'], + // 'fi_FI' => ['name_locale' => 'Finnish', 'name_english' => 'Finnish'], + // 'he_IL' => ['name_locale' => 'Hebrew', 'name_english' => 'Hebrew'], + // 'id_ID' => ['name_locale' => 'Bahasa Indonesia', 'name_english' => 'Indonesian'], + // 'ja_JA' => ['name_locale' => 'Japanese', 'name_english' => 'Japanese'], + // 'pt_PT' => ['name_locale' => 'Portuguese', 'name_english' => 'Portuguese'], + // 'sl_SI' => ['name_locale' => 'Slovenian', 'name_english' => 'Slovenian'], + // 'tlh_AA' => ['name_locale' => 'tlhIngan Hol', 'name_english' => 'Klingon'], + // 'el_GR' => ['name_locale' => 'Ελληνικά', 'name_english' => 'Greek'], + // 'tr_TR' => ['name_locale' => 'Türkçe', 'name_english' => 'Turkish'], + // 'sr_CS' => ['name_locale' => 'Serbian (Latin)', 'name_english' => 'Serbian (Latin)'], + // 'uk_UA' => ['name_locale' => 'Ukranian', 'name_english' => 'Ukranian'], ], 'transactionTypesByWhat' => [ 'expenses' => ['Withdrawal'], @@ -373,51 +381,51 @@ return [ ], 'bindables' => [ // models - 'account' => Account::class, - 'attachment' => Attachment::class, - 'availableBudget' => AvailableBudget::class, - 'bill' => Bill::class, - 'budget' => Budget::class, - 'budgetLimit' => BudgetLimit::class, - 'category' => Category::class, - 'linkType' => LinkType::class, - 'transactionType' => TransactionTypeModel::class, - 'journalLink' => TransactionJournalLink::class, - 'currency' => TransactionCurrency::class, - 'piggyBank' => PiggyBank::class, - 'preference' => Preference::class, - 'tj' => TransactionJournal::class, - 'tag' => Tag::class, - 'recurrence' => Recurrence::class, - 'rule' => Rule::class, - 'ruleGroup' => RuleGroup::class, - 'importJob' => ImportJob::class, - 'transactionGroup' => TransactionGroup::class, - 'user' => User::class, + 'account' => Account::class, + 'attachment' => Attachment::class, + 'availableBudget' => AvailableBudget::class, + 'bill' => Bill::class, + 'budget' => Budget::class, + 'budgetLimit' => BudgetLimit::class, + 'category' => Category::class, + 'linkType' => LinkType::class, + 'transactionType' => TransactionTypeModel::class, + 'journalLink' => TransactionJournalLink::class, + 'currency' => TransactionCurrency::class, + 'piggyBank' => PiggyBank::class, + 'preference' => Preference::class, + 'tj' => TransactionJournal::class, + 'tag' => Tag::class, + 'recurrence' => Recurrence::class, + 'rule' => Rule::class, + 'ruleGroup' => RuleGroup::class, + 'importJob' => ImportJob::class, + 'transactionGroup' => TransactionGroup::class, + 'user' => User::class, // strings - 'import_provider' => ImportProvider::class, - 'currency_code' => CurrencyCode::class, + 'import_provider' => ImportProvider::class, + 'currency_code' => CurrencyCode::class, // dates - 'start_date' => Date::class, - 'end_date' => Date::class, - 'date' => Date::class, + 'start_date' => Date::class, + 'end_date' => Date::class, + 'date' => Date::class, // lists - 'accountList' => AccountList::class, + 'accountList' => AccountList::class, 'doubleList' => AccountList::class, - 'budgetList' => BudgetList::class, - 'journalList' => JournalList::class, - 'categoryList' => CategoryList::class, - 'tagList' => TagList::class, + 'budgetList' => BudgetList::class, + 'journalList' => JournalList::class, + 'categoryList' => CategoryList::class, + 'tagList' => TagList::class, // others - 'fromCurrencyCode' => CurrencyCode::class, - 'toCurrencyCode' => CurrencyCode::class, - 'cliToken' => CLIToken::class, - 'tagOrId' => TagOrId::class, - 'configName' => ConfigurationName::class, + 'fromCurrencyCode' => CurrencyCode::class, + 'toCurrencyCode' => CurrencyCode::class, + 'cliToken' => CLIToken::class, + 'tagOrId' => TagOrId::class, + 'configName' => ConfigurationName::class, ], @@ -533,15 +541,15 @@ return [ ], - 'test-triggers' => [ + 'test-triggers' => [ 'limit' => 10, 'range' => 200, ], - 'default_currency' => 'EUR', - 'default_language' => 'en_US', - 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', - 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after', 'from', 'to', 'tag', 'created_on', - 'updated_on'], + 'default_currency' => 'EUR', + 'default_language' => 'en_US', + 'search_modifiers' => ['amount_is', 'amount', 'amount_max', 'amount_min', 'amount_less', 'amount_more', 'source', 'destination', 'category', + 'budget', 'bill', 'type', 'date', 'date_before', 'date_after', 'on', 'before', 'after', 'from', 'to', 'tag', 'created_on', + 'updated_on'], // TODO notes has_attachments 'cer_providers' => [ diff --git a/resources/lang/.gitignore b/resources/lang/.gitignore index 9441e6bc39..cb6b2ba6be 100644 --- a/resources/lang/.gitignore +++ b/resources/lang/.gitignore @@ -8,3 +8,5 @@ uk_UA sr_CS et_EE fi_FI +bg_BG +tlh_AA diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php index cc06f76c1e..13630e093a 100644 --- a/resources/lang/fr_FR/config.php +++ b/resources/lang/fr_FR/config.php @@ -32,7 +32,7 @@ return [ 'month_and_day_no_year' => '%e %B', 'date_time' => '%B %e %Y @ %T', 'specific_day' => '%e %B %Y', - 'week_in_year' => 'Week %V, %G', + 'week_in_year' => 'Semaine %V, %G', 'year' => '%Y', 'half_year' => '%B %Y', 'month_js' => 'MMMM YYYY', diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php index e59c7ebca9..48f2f43a99 100644 --- a/resources/lang/fr_FR/validation.php +++ b/resources/lang/fr_FR/validation.php @@ -197,7 +197,7 @@ return [ 'generic_invalid_destination' => 'Vous ne pouvez pas utiliser ce compte comme compte de destination.', 'gte.numeric' => 'La valeur de :attribute doit être supérieure ou égale à :value.', - 'gte.file' => 'The :attribute must be greater than or equal to :value kilobytes.', - 'gte.string' => 'The :attribute must be greater than or equal to :value characters.', - 'gte.array' => 'The :attribute must have :value items or more.', + 'gte.file' => 'L\'attribut :attribute doit contenir au moins :value kilo-octets.', + 'gte.string' => 'Le texte :attribute doit contenir au moins :value caractères.', + 'gte.array' => 'L\'attribut :attribute doit avoir :value éléments ou plus.', ]; diff --git a/resources/lang/it_IT/config.php b/resources/lang/it_IT/config.php index 513f2011ba..a201953372 100644 --- a/resources/lang/it_IT/config.php +++ b/resources/lang/it_IT/config.php @@ -32,7 +32,7 @@ return [ 'month_and_day_no_year' => '%B %e', 'date_time' => '%e %B %Y, @ %T', 'specific_day' => '%e %B %Y', - 'week_in_year' => 'Week %V, %G', + 'week_in_year' => 'Settimana %V, %G', 'year' => '%Y', 'half_year' => '%B %Y', 'month_js' => 'MMMM AAAA',