Merge pull request #321 from mobilarte/master

~ Updated ar/he
lairdubois · Aug 2, 2021 · 04aa55f · 04aa55f
2 parents e0086e9 + 0b5ee36
commit 04aa55f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ CHANGELOG
 
 This changelog references the relevant changes (bug and security fixes) done
 in 2.x, 1.x and 0.x versions.
-  
+
 * 2.1.1 (WIP)
 
   * Added thickness fields to labels
@@ -12,7 +12,8 @@ in 2.x, 1.x and 0.x versions.
   * Added total cut length in cutting diagram summary
   * Added model description in printable headers if it's defined
   * Improved dimensions display for small parts in cutting diagrams
-
+  * Leading/trailing spaces of material names removed during import
+
 * 2.1.0 (2021-05-28)
 
   * Added labels start offset

diff --git a/src/ladb_opencutlist/ruby/worker/importer/importer_import_worker.rb b/src/ladb_opencutlist/ruby/worker/importer/importer_import_worker.rb
@@ -93,9 +93,9 @@ def run
         # Retrieve material (or create it)
         material = nil
         unless part[:material].nil?
-          material = materials[part[:material]]
+          material = materials[part[:material].strip()]
           unless material
-            material = materials.add(part[:material])
+            material = materials.add(part[:material].strip())
             material.color = MATERIALS_PALETTE[material_palette_index]
             material_palette_index = (material_palette_index + 1) % MATERIALS_PALETTE.length
           end

diff --git a/src/ladb_opencutlist/yaml/i18n/ar.yml b/src/ladb_opencutlist/yaml/i18n/ar.yml
@@ -574,10 +574,12 @@ tab:
         total_part_count: مجموع القطع
         total_used: مجموع المُستعمَل
         trimming: تقليم
-        total_length_cuts: طول التقطيع
+        total_cut_count: عدد القطع
+        total_cut_length: طول التقطيع
         efficiency: الفاعلية
         leftover: البواقي
         cut: قطع
+        cut_plural: ""
         cut_final: القَطع الابتدائي (المستوى 1)
         cut_through: القَطع الابتدائي (المستوى 2)
         bar_dimensional_type_0: قضيب نظامي

diff --git a/src/ladb_opencutlist/yaml/i18n/he.yml b/src/ladb_opencutlist/yaml/i18n/he.yml
@@ -574,10 +574,12 @@ tab:
         total_part_count: סה"כ חלקים
         total_used: סה"כ בשימוש
         trimming: שוליים
-        total_length_cuts: אורך חיתוך
+        total_cut_count: מספר קיצוצים
+        total_cut_length: אורך חיתוך
         efficiency: יעילות
         leftover: פחת
         cut: חיתוך
+        cut_plural: קיצוצים
         cut_final: חיתוך ראשוני (רמה 1)
         cut_through: חיתוך ראשוני (רמה 2)
         bar_dimensional_type_0: לוח סטנדרטי