From 4cea5d65a6e04c506d56a52d592ab4344437cf0e Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 2 Apr 2018 06:56:19 +0200 Subject: [PATCH] Expand language list #1310 --- .sandstorm/setup.sh | 5 +++ composer.json | 9 +++-- composer.lock | 88 ++++++++++----------------------------------- readme.md | 1 + 4 files changed, 29 insertions(+), 74 deletions(-) diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 35aca44868..288379743e 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -14,12 +14,17 @@ apt-get install -y python-software-properties software-properties-common # install all languages sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen + +sed -i 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# id_ID.UTF-8 UTF-8/id_ID.UTF-8 UTF-8/g' /etc/locale.gen +sed -i 's/# it_IT.UTF-8 UTF-8/it_IT.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen +sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/g' /etc/locale.gen sed -i 's/# tr_TR.UTF-8 UTF-8/tr_TR.UTF-8 UTF-8/g' /etc/locale.gen + dpkg-reconfigure --frontend=noninteractive locales diff --git a/composer.json b/composer.json index 9b90499718..49c1ecdd6f 100644 --- a/composer.json +++ b/composer.json @@ -49,8 +49,8 @@ "ext-curl": "*", "ext-gd": "*", "ext-intl": "*", - "ext-zip": "*", "ext-xml": "*", + "ext-zip": "*", "bacon/bacon-qr-code": "1.*", "davejamesmiller/laravel-breadcrumbs": "5.*", "doctrine/dbal": "2.*", @@ -61,12 +61,11 @@ "league/commonmark": "0.*", "league/csv": "9.*", "league/fractal": "^0.17.0", - "pragmarx/google2fa": "2.*", - "pragmarx/google2fa-laravel": "^0.1.4", + "pragmarx/google2fa": "3.*", + "pragmarx/google2fa-laravel": "0.*", "rcrowe/twigbridge": "0.9.*", "rmccue/requests": "1.*", - "twig/twig": "1.*", - "watson/validating": "3.*" + "twig/twig": "1.*" }, "require-dev": { "barryvdh/laravel-debugbar": "3.*", diff --git a/composer.lock b/composer.lock index 5fd1caf2fb..4b66b09356 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "823070d72a990bfa26bdf63404e50651", + "content-hash": "3de47eba99b9bbd1bfb0f129fbf3494a", "packages": [ { "name": "bacon/bacon-qr-code", @@ -2153,16 +2153,16 @@ }, { "name": "pragmarx/google2fa", - "version": "v2.0.7", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa.git", - "reference": "5a818bda62fab0c0a79060b06d50d50b5525d631" + "reference": "40b3ce025bed0f9cd0c1c8ab7fc8265344c73de0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/5a818bda62fab0c0a79060b06d50d50b5525d631", - "reference": "5a818bda62fab0c0a79060b06d50d50b5525d631", + "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/40b3ce025bed0f9cd0c1c8ab7fc8265344c73de0", + "reference": "40b3ce025bed0f9cd0c1c8ab7fc8265344c73de0", "shasum": "" }, "require": { @@ -2193,7 +2193,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { @@ -2210,30 +2210,30 @@ "google2fa", "laravel" ], - "time": "2018-01-06T16:21:07+00:00" + "time": "2018-03-15T23:14:19+00:00" }, { "name": "pragmarx/google2fa-laravel", - "version": "v0.1.4", + "version": "v0.2.0", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa-laravel.git", - "reference": "38bd96a1732b9dea963c52e0f503a65265c077c9" + "reference": "54f0c30c9be5497a7bd248844f1099156457e719" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/38bd96a1732b9dea963c52e0f503a65265c077c9", - "reference": "38bd96a1732b9dea963c52e0f503a65265c077c9", + "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/54f0c30c9be5497a7bd248844f1099156457e719", + "reference": "54f0c30c9be5497a7bd248844f1099156457e719", "shasum": "" }, "require": { "laravel/framework": ">=5.2", "php": ">=5.4", - "pragmarx/google2fa": "~2.0" + "pragmarx/google2fa": "~3.0" }, "require-dev": { - "benconstable/phpspec-laravel": "~3.0", - "phpspec/phpspec": "~3" + "orchestra/testbench-browser-kit": "~3.4|~3.5|~3.6", + "phpunit/phpunit": "~5|~6|~7" }, "suggest": { "bacon/bacon-qr-code": "Required to generate inline QR Codes.", @@ -2246,7 +2246,7 @@ "Laravel" ], "branch-alias": { - "dev-master": "0.1-dev" + "dev-master": "0.2-dev" }, "laravel": { "providers": [ @@ -2260,7 +2260,7 @@ "autoload": { "psr-4": { "PragmaRX\\Google2FALaravel\\": "src/", - "spec\\PragmaRX\\Google2FALaravel\\": "tests/spec/" + "PragmaRX\\Google2FALaravel\\Tests\\": "tests/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2281,7 +2281,7 @@ "google2fa", "laravel" ], - "time": "2017-12-06T03:26:14+00:00" + "time": "2018-03-08T04:08:14+00:00" }, { "name": "psr/container", @@ -3869,56 +3869,6 @@ ], "time": "2016-09-01T10:05:43+00:00" }, - { - "name": "watson/validating", - "version": "3.1.2", - "source": { - "type": "git", - "url": "https://github.com/dwightwatson/validating.git", - "reference": "22edd06d45893f5d4f79c9e901bd7fbce174a79f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/validating/zipball/22edd06d45893f5d4f79c9e901bd7fbce174a79f", - "reference": "22edd06d45893f5d4f79c9e901bd7fbce174a79f", - "shasum": "" - }, - "require": { - "illuminate/contracts": ">=5.3", - "illuminate/database": ">=5.3", - "illuminate/events": ">=5.3", - "illuminate/support": ">=5.3", - "illuminate/validation": ">=5.3", - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Watson\\Validating\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dwight Watson", - "email": "dwight@studiousapp.com" - } - ], - "description": "Eloquent model validating trait.", - "keywords": [ - "eloquent", - "laravel", - "validation" - ], - "time": "2017-11-06T21:35:49+00:00" - }, { "name": "zendframework/zend-diactoros", "version": "1.7.1", @@ -6271,8 +6221,8 @@ "ext-curl": "*", "ext-gd": "*", "ext-intl": "*", - "ext-zip": "*", - "ext-xml": "*" + "ext-xml": "*", + "ext-zip": "*" }, "platform-dev": [] } diff --git a/readme.md b/readme.md index 6e685e0c3b..2b7eedb67b 100644 --- a/readme.md +++ b/readme.md @@ -74,6 +74,7 @@ But actually, it features: * 2 factor authentication for extra security 🔒 * Supports any currency you want, including [crypto currencies](http://firefly-iii.readthedocs.io/en/latest/concepts/currencies.html) such as ₿itcoin and Ξthereum * Lots of help text in case you don’t get it +* Translations into 10(!) languages, proudly powered by Crowdin Everything is organised: