Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1911-fix-route

circle.yml

@@ -38,6 +38,8 @@ dependencies:
   override:
     - composer install --no-progress --no-interaction --optimize-autoloader
   post:
+    - node -v
+    - npm -v
     - npm install
     - if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi
     - elasticsearch-2.3.3/bin/elasticsearch: {background: true}
@@ -61,4 +63,4 @@ database:
 test:
   override:
     - case $CIRCLE_NODE_INDEX in 0) EXIT=0; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-unit.xml --exclude-group legacy || EXIT=$?; php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-no-web.xml --group legacy --exclude-group web || EXIT=$?; exit $EXIT;; 1) php -d memory_limit=-1 bin/phpunit --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit-legacy-web.xml --group web ;; esac:
-        parallel: true
+        parallel: true

package.json

@@ -37,7 +37,7 @@
   "scripts": {
     "dev": "./node_modules/.bin/gulp sync;",
     "build": "./node_modules/.bin/gulp build;",
-    "postinstall": "./node_modules/.bin/gulp install;",
+    "postinstall": "./node_modules/.bin/gulp -v && ./node_modules/.bin/gulp install;",
     "phraseanet-production-client": "yarn remove phraseanet-production-client && yarn add phraseanet-production-client && ./node_modules/.bin/gulp build-phraseanet-production-client"
   },
   "dependencies": {
@@ -65,7 +65,7 @@
     "jquery.cookie": "^1.4.1",
     "jquery.fancytree": "^2.27.0",
     "normalize-css": "^2.1.0",
-    "npm": "^5.6.0",
+    "npm": "^6.0.0",
     "npm-modernizr": "^2.8.3",
     "phraseanet-production-client": "^0.33.0",
     "requirejs": "^2.1.22",

templates/web/admin/subdefs.html.twig

@@ -318,9 +318,10 @@
 
 {% block content %}
     <p>
-        <button id="create-subdef" class="btn btn-success">{{ 'Create new subdef' | trans }}</button>
+        <button id="create-subdef" class="btn btn-success">{{ 'create_subdef_button_label' | trans }}</button>
     </p>
-    <div id="dialog-delete-subdef" title="{{ 'Delete the subdef ?' | trans }}" style="display:none;">
+
+    <div id="dialog-delete-subdef" title="{{ 'delete_subdef_dialog_label ?' | trans }}" style="display:none;">
         <p>
             <span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>
             {{ 'These subdef will be permanently deleted and cannot be recovered. Are you sure?' | trans }}
@@ -331,15 +332,15 @@
         <p class="validateTips"></p>
         <form>
             <fieldset>
-                <label for="name">{{ 'Subdef name' | trans }}</label>
+                <label for="name">{{ 'create_subdef_modal_subdefinition_name' | trans }}</label>
                 <input type="text" name="name" id="name" class="text ui-widget-content ui-corner-all" value=""/><br/>
-                <label for="accessclass">{{ 'classe d\'acces' | trans }}</label>
+                <label for="accessclass">{{ 'create_subdef_modal_access_class' | trans }}</label>
                 <select name="accessclass" id="accessclass">
-                    <option value="document">{{ 'document' | trans }}</option>
-                    <option value="preview" selected="selected">{{ 'preview' | trans }}</option>
-                    <option value="thumbnail">{{ 'tout le monde' | trans }}</option>
+                    <option value="document">{{ 'create_subdef_modal_access_class_document' | trans }}</option>
+                    <option value="preview" selected="selected">{{ 'create_subdef_modal_access_class_preview' | trans }}</option>
+                    <option value="thumbnail">{{ 'create_subdef_modal_access_class_no_restriction' | trans }}</option>
                 </select>
-                <label for="subviewType">{{ 'subviewType' | trans }}</label>
+                <label for="subviewType">{{ 'create_subdef_modal_subviewType' | trans }}</label>
                 <select name="subviewType" id="subviewType" onchange="subview_type(this)">
                     <option>{{ 'Choisir' | trans }}</option>
                     <option value="image">{{ 'image' | trans }}</option>
@@ -348,11 +349,11 @@
                     <option value="document">{{ 'document' | trans }}</option>
                     <option value="flash">{{ 'flash' | trans }}</option>
                 </select>
-                <label for="mediaType">{{ 'mediatype' | trans }}</label>
+                <label for="mediaType">{{ 'create_subdef_modal_mediatype' | trans }}</label>
                 <select name="mediaType" id="mediaType" onchange="media_type(this)">
                     <option>{{ 'Choisir' | trans }}</option>
                 </select>
-                <label for="presets">{{ 'Presets' | trans }}</label>
+                <label for="presets">{{ 'create_subdef_modal_presets' | trans }}</label>
                 <select name="presets" id="presets">
                     <option>{{ 'Choisir' | trans }}</option>
                 </select>