Merge pull request #2341 from mruminski/master

Update messages.pl.yml

diff --git a/.travis.yml b/.travis.yml
index c5fe7b01d03f9315db2798e28e28dfa667ce6d31..b0b26b56eaf3ece129e61f4f51a04f6bcd694c38 100644 (file)
--- 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 f7bc2e4f742795b057cbb3fbe7561a820dbfe49e..7fa8c625ead18f6eeed7f74b4f7a70734c9d1d90 100644 (file)
--- 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 adf288bd501db0139ede85abd3efd417c187df06..5820a0d23a6830687e783bfedda0bfb52dadc46e 100644 (file)
--- 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 23bf36828e6cc363bab900b0347cd8710f635648..7c20f4ee8533563225bc0d0d1f0289482cd95137 100644 (file)
--- 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 7954fe0b39a0bb00811a853f238fe09f6a01d101..82fa6f4e23879a8fd2d4860fe628fa1e05158a4a 100644 (file)
--- 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 6a0818b3a5e234474c98b099ce19494f66854a33..3391c2cd79587d0a7602dc9f7ebe49dcd8f9b341 100644 (file)
--- 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 63a77e7c8f28d98eefdc57c9c95b106a4d4e69f6..234045ba474e263fd2d042b2c11c409cb2601d16 100644 (file)
--- 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 f9777890e35bd46cdc8ad606fc96f8fa8be43de5..bb4de534f1bf4c38f5e4c6abfab7b91309f67138 100644 (file)
--- 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 d8dfac6ebff807079a1b7b3175b899d6d0d1d9be..8d8ad806dc3a3fb0a055914c680732a5eab151a5 100644 (file)
--- 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 dc66682a58a9b4376882ede555ddc90461cf3bc8..fdd1f0cbbb4802b32ee680f7ebaa2383812cc430 100644 (file)
--- 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 29b343b2954ab66135db427124eff3033e15cc31..87d53bf09e7f3b4a822c7492cf75c6ce06c62704 100755 (executable)
--- 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 61a4f6fd46d725b34aa50adf1ee477a5ac8cfcb0..cbd47495391158f2625a2897b560e11532ab61d1 100755 (executable)
--- 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 b847c46c6369a0552a374cc36da9c8cbb78c9179..130ab2cdd40e66fecbea308f2bd9dd3c2b8dc571 100644 (file)
--- 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'