Remove units ('g' and '%') from placeholders in jams

static/zetikettes.js

@@ -29,8 +29,8 @@ const zetikettes = [
         'sticker': 'Gelée Extra - Groseille.svg',
         'subs': {
             'dluo': 'décembre 2023',
-            'fruit': '80g',
+            'fruit': '80',
-            'teneur': '50%',
+            'teneur': '50',
             'lot': '0722-2',
             'qty': '370',
         },
@@ -41,8 +41,8 @@ const zetikettes = [
         'sticker': 'Gelée Extra - Groseille Basilic.svg',
         'subs': {
             'dluo': 'décembre 2023',
-            'fruit': '80g',
+            'fruit': '80',
-            'teneur': '50%',
+            'teneur': '50',
             'lot': '0000-0',
             'qty': '370',
         },
@@ -53,8 +53,8 @@ const zetikettes = [
         'sticker': 'Gelée Extra - Cassis.svg',
         'subs': {
             'dluo': 'décembre 2023',
-            'fruit': '80g',
+            'fruit': '80',
-            'teneur': '50%',
+            'teneur': '50',
             'lot': '0722-2',
             'qty': '370',
         },

templates/Gelée Extra - Cassis.svg

@@ -6,7 +6,7 @@
    version="1.1"
    id="svg8"
    inkscape:version="1.2 (dc2aeda, 2022-05-15)"
-   sodipodi:docname="Gelée - Cassis.svg"
+   sodipodi:docname="Gelée Extra - Cassis.svg"
    inkscape:export-filename="/home/maxime/Documents/Anne/Etiquettes/Bitmap Images/Pesto - Ail des Ours.png"
    inkscape:export-xdpi="600"
    inkscape:export-ydpi="600"
@@ -464,8 +464,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.588235"
-     inkscape:cx="50.999999"
+     inkscape:cx="51.039721"
-     inkscape:cy="24.030374"
+     inkscape:cy="24.109814"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -670,9 +670,9 @@
            y="260.58517"
            style="stroke-width:1" /></flowRegion><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
-         id="flowPara25590">Préparé avec $fruit de fruits pour 100g de produit fini</flowPara><flowPara
+         id="flowPara25590">Préparé avec ${fruit}g de fruits pour 100g de produit fini</flowPara><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
-         id="flowPara15488">Teneur totale en sucre : $teneur</flowPara><flowPara
+         id="flowPara15488">Teneur totale en sucre : ${teneur}%</flowPara><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
          id="flowPara15664" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
@@ -950,14 +950,14 @@
        y="0"><tspan
          x="50.939212"
          y="57.214325"
-         id="tspan33100"><tspan
+         id="tspan20972"><tspan
            style="font-size:4.4px;font-family:Karumbi;-inkscape-font-specification:'Karumbi, Normal';text-align:center;text-anchor:middle"
-           id="tspan33098">Culture et cueillette à la main </tspan></tspan><tspan
+           id="tspan20970">Culture et cueillette à la main </tspan></tspan><tspan
          x="49.606019"
          y="59.63704"
-         id="tspan33104"><tspan
+         id="tspan20976"><tspan
            style="font-size:4.4px;font-family:Karumbi;-inkscape-font-specification:'Karumbi, Normal';text-align:center;text-anchor:middle"
-           id="tspan33102">dans les Alpes de Haute-Provence</tspan></tspan></text>
+           id="tspan20974">dans les Alpes de Haute-Provence</tspan></tspan></text>
     <text
        xml:space="preserve"
        transform="matrix(0.26458333,0,0,0.26458333,-0.08616885,254.62006)"
@@ -965,16 +965,16 @@
        style="font-size:2.26667px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect25582);display:inline"><tspan
          x="45.853516"
          y="-5.4282527"
-         id="tspan33108"><tspan
+         id="tspan20980"><tspan
            style="font-weight:bold"
-           id="tspan33106">Ingrédients :
+           id="tspan20978">Ingrédients :
 </tspan></tspan><tspan
          x="45.853516"
          y="-3.1615825"
-         id="tspan33110">
+         id="tspan20982">
 </tspan><tspan
          x="45.853516"
          y="-0.89491247"
-         id="tspan33112">cassis*, sucre de canne*</tspan></text>
+         id="tspan20984">cassis*, sucre de canne*</tspan></text>
   </g>
 </svg>

templates/Gelée Extra - Groseille Basilic.svg

@@ -691,9 +691,9 @@
            y="260.58517"
            style="stroke-width:1" /></flowRegion><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
-         id="flowPara25590">Préparé avec $fruit de fruits pour 100g de produit fini</flowPara><flowPara
+         id="flowPara25590">Préparé avec ${fruit}g de fruits pour 100g de produit fini</flowPara><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
-         id="flowPara15488">Teneur totale en sucre : $teneur</flowPara><flowPara
+         id="flowPara15488">Teneur totale en sucre : ${teneur}%</flowPara><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
          id="flowPara15664" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
@@ -973,14 +973,14 @@
        y="0"><tspan
          x="50.939212"
          y="57.214325"
-         id="tspan7993"><tspan
+         id="tspan19814"><tspan
            style="font-size:4.4px;font-family:Karumbi;-inkscape-font-specification:'Karumbi, Normal';text-align:center;text-anchor:middle"
-           id="tspan7991">Culture et cueillette à la main </tspan></tspan><tspan
+           id="tspan19812">Culture et cueillette à la main </tspan></tspan><tspan
          x="49.606019"
          y="59.63704"
-         id="tspan7997"><tspan
+         id="tspan19818"><tspan
            style="font-size:4.4px;font-family:Karumbi;-inkscape-font-specification:'Karumbi, Normal';text-align:center;text-anchor:middle"
-           id="tspan7995">dans les Alpes de Haute-Provence</tspan></tspan></text>
+           id="tspan19816">dans les Alpes de Haute-Provence</tspan></tspan></text>
     <text
        xml:space="preserve"
        transform="matrix(0.26458333,0,0,0.26458333,-0.08616885,254.62006)"
@@ -988,20 +988,20 @@
        style="font-size:2.26667px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect25582);display:inline"><tspan
          x="45.853516"
          y="-5.4282527"
-         id="tspan8001"><tspan
+         id="tspan19822"><tspan
            style="font-weight:bold"
-           id="tspan7999">Ingrédients :
+           id="tspan19820">Ingrédients :
 </tspan></tspan><tspan
          x="45.853516"
          y="-3.1615825"
-         id="tspan8003">
+         id="tspan19824">
 </tspan><tspan
          x="45.853516"
          y="-0.89491247"
-         id="tspan8005">groseille*, sucre de canne*, basilic </tspan><tspan
+         id="tspan19826">groseille*, sucre de canne*, basilic </tspan><tspan
          x="45.853516"
          y="1.3717575"
-         id="tspan8007">grand vert (2%)</tspan></text>
+         id="tspan19828">grand vert (2%)</tspan></text>
     <flowRoot
        xml:space="preserve"
        id="flowRoot5844"

templates/Gelée Extra - Groseille.svg

@@ -464,8 +464,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.588235"
-     inkscape:cx="49.411216"
+     inkscape:cx="49.450936"
-     inkscape:cy="24.030374"
+     inkscape:cy="24.109814"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -670,9 +670,9 @@
            y="260.58517"
            style="stroke-width:1" /></flowRegion><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
-         id="flowPara25590">Préparé avec $fruit de fruits pour 100g de produit fini</flowPara><flowPara
+         id="flowPara25590">Préparé avec ${fruit}g de fruits pour 100g de produit fini</flowPara><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
-         id="flowPara15488">Teneur totale en sucre : $teneur</flowPara><flowPara
+         id="flowPara15488">Teneur totale en sucre : ${teneur}%</flowPara><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
          id="flowPara15664" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.04726px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;text-anchor:start"
@@ -950,14 +950,14 @@
        y="0"><tspan
          x="50.939212"
          y="57.214325"
-         id="tspan3327"><tspan
+         id="tspan22491"><tspan
            style="font-size:4.4px;font-family:Karumbi;-inkscape-font-specification:'Karumbi, Normal';text-align:center;text-anchor:middle"
-           id="tspan3325">Culture et cueillette à la main </tspan></tspan><tspan
+           id="tspan22489">Culture et cueillette à la main </tspan></tspan><tspan
          x="49.606019"
          y="59.63704"
-         id="tspan3331"><tspan
+         id="tspan22495"><tspan
            style="font-size:4.4px;font-family:Karumbi;-inkscape-font-specification:'Karumbi, Normal';text-align:center;text-anchor:middle"
-           id="tspan3329">dans les Alpes de Haute-Provence</tspan></tspan></text>
+           id="tspan22493">dans les Alpes de Haute-Provence</tspan></tspan></text>
     <text
        xml:space="preserve"
        transform="matrix(0.26458333,0,0,0.26458333,-0.08616885,254.62006)"
@@ -965,16 +965,16 @@
        style="font-size:2.26667px;line-height:100%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect25582);display:inline"><tspan
          x="45.853516"
          y="-5.4282527"
-         id="tspan3335"><tspan
+         id="tspan22499"><tspan
            style="font-weight:bold"
-           id="tspan3333">Ingrédients :
+           id="tspan22497">Ingrédients :
 </tspan></tspan><tspan
          x="45.853516"
          y="-3.1615825"
-         id="tspan3337">
+         id="tspan22501">
 </tspan><tspan
          x="45.853516"
          y="-0.89491247"
-         id="tspan3339">groseille*, sucre de canne*</tspan></text>
+         id="tspan22503">groseille*, sucre de canne*</tspan></text>
   </g>
 </svg>