Merge pull request #36 from Spythere/development

v1.8.10

.github/workflows/firebase-hosting-merge.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npm ci && npm run build
+      - run: yarn && yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/firebase-hosting-pull-request.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npm ci && npm run build
+      - run: yarn && yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

.gitignore

@@ -25,7 +25,4 @@ pnpm-debug.log*
 node_modules
 
 # Dev files
-stockInfoDev.json
+stockInfoDev.json
-
-# Lock files
-yarn.lock

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pojazdownik",
-  "version": "1.8.9",
+  "version": "1.8.10",
   "private": true,
   "type": "module",
   "scripts": {

src/constants/numberGeneratorData.json

@@ -43,19 +43,22 @@
     "PW": ["6", "000", "899"],
     "PX": ["6", "000", "899"],
 
-    "TC": ["0", "000", "899"],
+    "TM": ["4", "000", "899"],
+    "TN": ["3", "000", "899"],
+    "TK": ["3", "000", "899"],
+    "TD": ["2", "000", "899"],
     "TG": ["1", "000", "899"],
     "TR": ["1", "000", "899"],
-    "TD": ["2", "000", "899"],
+    "TC": ["0", "000", "899"],
-    "TK": ["3", "000", "899"],
-    "TN": ["3", "000", "899"],
-    "TM": ["4", "000", "899"],
     "TS": ["5", "000", "899"],
+    "TH": ["5", "000", "899"],
 
     "LT": ["5", "000", "899"],
     "LP": ["6", "000", "899"],
     "LS": ["9", "000", "899"],
+    "LZ": ["9", "000", "899"],
 
-    "ZN": ["9", "000", "899"]
+    "ZN": ["9", "000", "899"],
+    "ZU": ["9", "000", "899"]
   }
 }

src/locales/en.json

@@ -128,36 +128,37 @@
       "EI": "EI - domestic express",
       "EC": "EC - international express",
       "EN": "EN - domestic night express",
-
+  
       "MP": "MP - intervoivodeship bullet",
-      "RP": "RP - voivodeship bullet",
       "MO": "MO - intervoivodeship regio",
-      "RO": "RO - voivodeship regio",
-
       "MM": "MM - international bullet",
-      "MH": "MH - intervoivodeship bullet (night / hotel)",
+      "MH": "MH - intervoivodeship night bullet",
+      
+      "RP": "RP - voivodeship bullet",
       "RM": "RM - international voivodeship regio",
+      "RO": "RO - voivodeship regio",
       "RA": "RA - voivodeship regio (urban)",
-
+  
       "PW": "PW - empty passenger",
       "PX": "PX - empty passenger test drive",
-
+  
       "TC": "TC - international freight (intermodal)",
-      "TG": "TG - international freight (cargo)",
+      "TG": "TG - international freight (organized cargo)",
-      "TR": "TR - international freight (no cargo)",
+      "TR": "TR - international freight (unorganized cargo)",
       "TD": "TD - domestic freight (intermodal)",
-      "TM": "TM - domestic freight (cargo)",
+      "TM": "TM - domestic freight (organized cargo)",
-      "TN": "TN - domestic freight (no cargo)",
+      "TN": "TN - domestic freight (unorganized cargo)",
-      "TK": "TK - freight (stations & sidings)",
+      "TK": "TK - freight (for stations & sidings)",
       "TS": "TS - empty freight test drive",
-
+      "TH": "TH - locomotive rolling stock (over 3 vehicles)",
-      "LT": "LT - locomotive only",
+  
-      "LT-new": "LT - freight locomotive only",
+      "LT": "LT - freight locomotive only",
-
       "LP": "LP - passenger locomotive only",
-      "LS": "LS - shunting locomotive",
+      "LS": "LS - shunting locomotive only",
-
+      "LZ": "LS - shunting locomotive only",
-      "ZN": "ZN - inspection / diagnostic"
+  
+      "ZN": "ZN - inspection / diagnostic type",
+      "ZU": "ZU - other maintenance type"
     }
   },
   "wiki": {

src/locales/pl.json

@@ -150,14 +150,15 @@
       "TN": "TN - towarowy krajowy niemasowy",
       "TK": "TK - towarowy (stacje i bocznice)",
       "TS": "TS - towarowy próżny próbny",
+      "TH": "TH - skład lokomotyw (powyżej 3 pojazdów)",
 
-      "LT": "LT - lokomotywa luzem",
+      "LT": "LT - lokomotywa towarowa luzem",
-      "LT-new": "LT - lokomotywa towarowa luzem",
-
       "LP": "LP - lokomotywa pasażerska luzem",
-      "LS": "LS - lokomotywa manewrowa",
+      "LS": "LS - lokomotywa manewrowa luzem",
+      "LZ": "LZ - lokomotywa dla poc. utrzymaniowo-naprawczych",
 
-      "ZN": "ZN - inspekcyjny / diagnostyczny"
+      "ZN": "ZN - inspekcyjny / diagnostyczny",
+      "ZU": "ZU - inny utrzymaniowy"
     }
   },
   "wiki": {