wip #5672 @1

diff --git a/Michelin/_doc/data.xlsx b/Michelin/_doc/data.xlsx
index f85d61741176185b1b17c976004de185d87c41cc..ea33907cc71a1b0630726b2677b84c2aa9719c43 100644 (file)
Binary files a/Michelin/_doc/data.xlsx and b/Michelin/_doc/data.xlsx differ

diff --git a/Michelin/_tools/importdata.php b/Michelin/_tools/importdata.php
index 012f5c389bb34ade6075b0b0f9a62f7fa4012f51..ea89d8834b13528236481762641d2b63a97f1f15 100644 (file)
--- a/Michelin/_tools/importdata.php
+++ b/Michelin/_tools/importdata.php
@@ -32,5 +32,4 @@ foreach ($fluidbooks as $fluidbook => $locale) {
        $data = postFiles('https://toolbox.fluidbook.com/opentools/doexcel2json', $xlsx, 'file', ['dataorg' => 'excelToArrayIndexKeyVars', 'sheet' => $fluidbook, 'format' => 'js']);
        file_put_contents($js, $data . "\nvar DEFAULT_LOCALE='" . $locale . "';");
 
-}
-header('Location: ../');
+}
\ No newline at end of file

diff --git a/Michelin/_tools/publish.php b/Michelin/_tools/publish.php
index 9c6ea77033e95f6cec830fba947a68414bc190ae..89ba175c8f647222d80800f2e652c24d88dd7bf8 100644 (file)
--- a/Michelin/_tools/publish.php
+++ b/Michelin/_tools/publish.php
@@ -1,9 +1,10 @@
 <?php
-require_once __DIR__ . '/common.php';
+require_once __DIR__.'/importdata.php';
 $root = realpath(__DIR__ . '/../');
 foreach ($fluidbooks as $fluidbook => $locale) {
        copy($root . '/data-' . $fluidbook . '.js', $root . '/data.js');
-       $zip = '"C:\Program Files\7-Zip\7z.exe" a -tzip ' . $root . '/Michelin.zip ' . $root . '/ -xr0!_doc -xr0!_tools -xr0!*.zip -xr0!*.less -xr0!*.map';
+       unlink($root.'/Michelin.zip');
+       $zip = '"C:\Program Files\7-Zip\7z.exe" a -tzip ' . $root . '/Michelin.zip ../ -xr0!_doc -xr0!_tools -xr0!*.zip -xr0!*.less -xr0!*.map -xr0!data-*.js';
        echo `$zip`;
        echo `scp -P 51895 ../Michelin.zip extranet@workshop.fluidbook.com:/application/fluidbook/books/working/$fluidbook`;
 }

diff --git a/Michelin/index.html b/Michelin/index.html
index 49b99ad2e1f7fc00bb43e3dcf443b5b1792c3efa..c8222d0e62e58317451b7591a708ecece4ae15ff 100644 (file)
--- a/Michelin/index.html
+++ b/Michelin/index.html
@@ -53,6 +53,7 @@
 <script src="../../jquery.js"></script>
 <!--<script src="https://code.jquery.com/jquery-3.6.1.min.js"></script>-->
 <script src="jquery.multi-select.js"></script>
+<script src="data.js"></script>
 <script src="locales.js"></script>
 <script src="l10n.js"></script>
 <script src="script.js"></script>

diff --git a/Michelin/locales.js b/Michelin/locales.js
index 90b3e2d9cdf9432abc4c11f7af5629133d3dfb70..3c51e78dda63aa8694556725752c0ed93888ab85 100644 (file)
--- a/Michelin/locales.js
+++ b/Michelin/locales.js
@@ -1 +1 @@
-var LOCALES={"en":{"Universe":"Universe","Track":"Track","Sport & Road":"Sport & Road","Off-Road":"Off-Road","Urban Mobility":"Urban Mobility","Front width":"Front width","Front ratio":"Front ratio","Front diameter":"Front diameter","Rear width":"Rear width","Rear ratio":"Rear ratio","Rear diameter":"Rear diameter","Position":"Position","Front":"Front","Rear":"Rear","Front-Rear":"Front-Rear","Results":"Results","New search":"New search"},"nl":{"Universe":"Wereld","Track":"Circuit","Sport & Road":"Sport & Road","Off-Road":"Off-Road","Urban Mobility":"Stedelijke Mobiliteit","Front width":"Breedte Voor","Front ratio":"verhouding Voor","Front diameter":"Diameter Voor","Rear width":"Breedte Achter","Rear ratio":"Verhouding Achter","Rear diameter":"Diameter Achter","Position":"Positie","Front":"Voor","Rear":"Achter","Front-Rear":"Voor-Achter","Results":"Resultaten","New search":"nieuwe zoekopdracht"},"it":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":""},"sp":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":""},"pt":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":""},"de":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":""},"fr":{"Universe":"Univers","Track":"Circuit","Sport & Road":"Sport & Road","Off-Road":"Off-Road","Urban Mobility":"Mobilit\u00e9 Urbaine","Front width":"Largeur AV","Front ratio":"Ratio AV","Front diameter":"Diam\u00e8tre AV","Rear width":"Largeur AR","Rear ratio":"Ratio AR","Rear diameter":"Diam\u00e8tre AR","Position":"Position","Front":"Avant","Rear":"Arri\u00e8re","Front-Rear":"AV-AR","Results":"R\u00e9sultats","New search":"Recommencer"}};
\ No newline at end of file
+var LOCALES={"en":{"Universe":"Universe","Track":"Track","Sport & Road":"Sport & Road","Off-Road":"Off-Road","Urban Mobility":"Urban Mobility","Front width":"Front width","Front ratio":"Front ratio","Front diameter":"Front diameter","Rear width":"Rear width","Rear ratio":"Rear ratio","Rear diameter":"Rear diameter","Position":"Position","Front":"Front","Rear":"Rear","Front-Rear":"Front-Rear","Results":"Results","New search":"New search","Back":"Back"},"nl":{"Universe":"Wereld","Track":"Circuit","Sport & Road":"Sport & Road","Off-Road":"Off-Road","Urban Mobility":"Stedelijke Mobiliteit","Front width":"Breedte Voor","Front ratio":"verhouding Voor","Front diameter":"Diameter Voor","Rear width":"Breedte Achter","Rear ratio":"Verhouding Achter","Rear diameter":"Diameter Achter","Position":"Positie","Front":"Voor","Rear":"Achter","Front-Rear":"Voor-Achter","Results":"Resultaten","New search":"nieuwe zoekopdracht","Back":""},"it":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":"","Back":""},"sp":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":"","Back":""},"pt":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":"","Back":""},"de":{"Universe":"","Track":"","Sport & Road":"","Off-Road":"","Urban Mobility":"","Front width":"","Front ratio":"","Front diameter":"","Rear width":"","Rear ratio":"","Rear diameter":"","Position":"","Front":"","Rear":"","Front-Rear":"","Results":"","New search":"","Back":""},"fr":{"Universe":"Univers","Track":"Circuit","Sport & Road":"Sport & Road","Off-Road":"Off-Road","Urban Mobility":"Mobilit\u00e9 Urbaine","Front width":"Largeur AV","Front ratio":"Ratio AV","Front diameter":"Diam\u00e8tre AV","Rear width":"Largeur AR","Rear ratio":"Ratio AR","Rear diameter":"Diam\u00e8tre AR","Position":"Position","Front":"Avant","Rear":"Arri\u00e8re","Front-Rear":"AV-AR","Results":"R\u00e9sultats","New search":"Recommencer","Back":"Pr\u00e9c\u00e9dent"}};
\ No newline at end of file