From: Thomas Citharel Date: Mon, 3 Oct 2016 14:44:19 +0000 (+0200) Subject: Merge pull request #2341 from mruminski/master X-Git-Tag: 2.1.1~6 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=aafb3321b75976bd4614d5c033df175853f0cbb0;hp=0113e2af1febccea96afe512d04eca97f63a7e22;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2341 from mruminski/master Update messages.pl.yml --- diff --git a/.travis.yml b/.travis.yml index c5fe7b01..b0b26b56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,8 +91,8 @@ before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; script: - - travis_wait bash install.sh + - travis_wait bash install_dev.sh - ant prepare-$DB - - phpunit -v + - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi; - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index f7bc2e4f..7fa8c625 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -56,6 +56,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen: cd wallabag git checkout 2.1.0 ASSETS=build ./install.sh + php bin/console wallabag:install --env=prod Um PHPs eingebauten Server zu starten und zu testen, ob alles korrekt installiert wurde, kannst du folgendes Kommando ausführen: diff --git a/docs/de/user/upgrade-2.0.x-2.0.y.rst b/docs/de/user/upgrade-2.0.x-2.0.y.rst index adf288bd..5820a0d2 100644 --- a/docs/de/user/upgrade-2.0.x-2.0.y.rst +++ b/docs/de/user/upgrade-2.0.x-2.0.y.rst @@ -8,6 +8,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.0.8 diff --git a/docs/de/user/upgrade-2.0.x-2.1.y.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst index 23bf3682..7c20f4ee 100644 --- a/docs/de/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst @@ -11,6 +11,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.1.0 diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 7954fe0b..82fa6f4e 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -55,6 +55,7 @@ To install wallabag itself, you must run the following commands: cd wallabag git checkout 2.1.0 ASSETS=build ./install.sh + php bin/console wallabag:install --env=prod To start PHP's build-in server and test if everything did install correctly, you can do: diff --git a/docs/en/user/upgrade-2.0.x-2.0.y.rst b/docs/en/user/upgrade-2.0.x-2.0.y.rst index 6a0818b3..3391c2cd 100644 --- a/docs/en/user/upgrade-2.0.x-2.0.y.rst +++ b/docs/en/user/upgrade-2.0.x-2.0.y.rst @@ -8,6 +8,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.0.8 diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst index 63a77e7c..234045ba 100644 --- a/docs/en/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst @@ -11,6 +11,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.1.0 diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index f9777890..bb4de534 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -53,6 +53,7 @@ Pour installer wallabag, vous devez exécuter ces commandes : cd wallabag git checkout 2.1.0 ASSETS=build ./install.sh + php bin/console wallabag:install --env=prod Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : diff --git a/docs/fr/user/upgrade-2.0.x-2.0.y.rst b/docs/fr/user/upgrade-2.0.x-2.0.y.rst index d8dfac6e..8d8ad806 100644 --- a/docs/fr/user/upgrade-2.0.x-2.0.y.rst +++ b/docs/fr/user/upgrade-2.0.x-2.0.y.rst @@ -8,6 +8,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.0.8 diff --git a/docs/fr/user/upgrade-2.0.x-2.1.y.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst index dc66682a..fdd1f0cb 100644 --- a/docs/fr/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst @@ -11,6 +11,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.1.0 diff --git a/install.sh b/install.sh index 29b343b2..87d53bf0 100755 --- a/install.sh +++ b/install.sh @@ -1,15 +1,13 @@ #! /usr/bin/env bash -if [[ $ASSETS == 'build' ]]; then - echo "Installing PHP dependencies through Composer..." - composer install --no-interaction --no-progress --prefer-dist -o - - chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm - echo "Downloading librairies through npm..." - vendor/mouf/nodejs-installer/bin/local/npm install - - echo "Concat, minify and installing assets..." - node_modules/grunt/bin/grunt -else - composer install --no-interaction --no-progress --prefer-dist -o -fi +echo " > Installing PHP dependencies through Composer..." +composer install --no-interaction --no-progress --prefer-dist -o --no-dev + +chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm +echo " > Downloading librairies through npm..." +vendor/mouf/nodejs-installer/bin/local/npm install + +echo " > Concat, minify and installing assets..." +node_modules/grunt/bin/grunt + +echo " > Install finished" diff --git a/install_dev.sh b/install_dev.sh index 61a4f6fd..cbd47495 100755 --- a/install_dev.sh +++ b/install_dev.sh @@ -1,13 +1,14 @@ #! /usr/bin/env bash -echo "Installing PHP dependencies (including dev) through Composer..." -composer install +echo " > Installing PHP dependencies (including dev) through Composer..." +composer install -o --no-interaction --no-progress --prefer-dist -echo "Downloading librairies through npm..." -npm install +if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then + echo " > Downloading librairies through npm..." + npm install -echo "Concat, minify and installing assets..." -grunt + echo " > Concat, minify and installing assets..." + grunt +fi -echo "Installing wallabag..." -php bin/console wallabag:install +echo " > Install finished" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index b847c46c..130ab2cd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -302,7 +302,7 @@ quickstart: use_docker: 'Nutze Docker, um wallabag zu installieren' docs: title: 'Komplette Dokumentation' - description: "Es gibt so viele Features in wallabag. Scheue dich nicht die Anleitung zu lesen, um die Features kennenzulernen und zu lernen, wie sie genutzt werden." + description: "Es gibt so viele Features in wallabag. Zögere nicht, die Features im Handbuch zu erkunden und zu lernen, wie sie funktionieren." annotate: 'Anmerkungen zu Artikeln hinzufügen' export: 'Artikel nach ePUB oder PDF konvertieren' search_filters: 'Schau nach, wie du nach einem Artikel über die Such- und Filterfunktion suchen kannst'