Merge branch '6.2.0'

CHANGELOG.md

@@ -4,7 +4,12 @@ CHANGELOG
 This changelog references the relevant changes (bug and security fixes) done
 in 6.x, 5.x, 4.x, 3.x, 2.x, 1.x and 0.x versions.
 
-* 6.1.0 (20234-03-05)
+* 6.2.0 (2024-03-22)
+
+  * Added **Chinese** language
+  * Fixed multiline material description UI bug
+
+* 6.1.0 (2024-03-05)
 
   * Added **Portuguese** language (thanks to Henny Ferreira for joining the translators team)
   * Fixed _Clippy_ loading when OpenCutList installed under a non-ASCII path

build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lairdubois-opencutlist-sketchup-extension",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "OpenCutList by L'Air du Bois =======================================",
   "main": "index.js",
   "directories": {

dist/manifest.json

@@ -1,6 +1,6 @@
 {
-  "version": "6.1.0",
-  "build": "202403031324",
+  "version": "6.2.0",
+  "build": "202403210933",
   "url": "https://www.lairdubois.fr/opencutlist/download",
   "sponsor": {
     "objectiveName": "7.0",

src/ladb_opencutlist.rb

@@ -20,7 +20,7 @@ module OpenCutList
 
       # Create extension
       ex = SketchupExtension.new('OpenCutList', File.join(PLUGIN_DIR, 'ruby', 'main'))
-      ex.version     = "6.1.0"  ## /!\ Auto-generated line, do not edit ##
+      ex.version     = "6.2.0"  ## /!\ Auto-generated line, do not edit ##
       ex.copyright   = "2016-#{Date.today.year} - GNU GPLv3"  ## /!\ Auto-generated line, do not edit ##
       ex.creator     = 'L\'Air du Bois - www.lairdubois.fr'
 
@@ -50,6 +50,8 @@ module OpenCutList
         ex.description = 'Плагин расчета карт раскроя для деревообработчиков и не только. Открытый исходный код, краундфандинг и простота использования ;)'
       when 'uk'
         ex.description = 'Плагін розрахунку карт розкрою листового та погонного матеріалів для деревообробників і не тільки. Відкритий вихідний код, фінансується користувачами і простий у використанні ;)'
+      when 'zh'
+        ex.description = '木工的切割清单和切割图生成器。 开源，众筹且易于使用 ;)'
       else
         ex.description = 'Cutlist and Cutting Diagram Generator for Woodworkers. Open Source, crowdfunded and easy to use ;)'
       ## DESCRIPTION_END ##

src/ladb_opencutlist/js/constants.js

@@ -1,7 +1,7 @@
 // CONSTANTS
 // ======================
 
-var EXTENSION_BUILD = '202403031324';   // /!\ Auto-generated line, do not edit //
+var EXTENSION_BUILD = '202403210933';   // /!\ Auto-generated line, do not edit //
 
 // UI /////
 

src/ladb_opencutlist/ruby/constants.rb

@@ -1,11 +1,11 @@
 module Ladb::OpenCutList
 
     EXTENSION_NAME = 'OpenCutList'.freeze
-    EXTENSION_VERSION = '6.1.0'.freeze
-    EXTENSION_BUILD = '202403031324'.freeze
+    EXTENSION_VERSION = '6.2.0'.freeze
+    EXTENSION_BUILD = '202403210933'.freeze
 
     DEFAULT_LANGUAGE = 'en'
-    ENABLED_LANGUAGES = %w[ar cs de en es fr he it nl pt ru uk]
+    ENABLED_LANGUAGES = %w[ar cs de en es fr he it nl pt ru uk zh]
 
     FILE_FORMAT_SKP = 'skp'.freeze
     FILE_FORMAT_STL = 'stl'.freeze

src/ladb_opencutlist/twig/tabs/cutlist/_material-origins.twig

@@ -1,18 +1,16 @@
 
 {# set materialOrigin #}
-{# set displayOwned (facultative) #}
 {# set flat (facultative) #}
 {# set noColor (facultative) #}
 {# set noPrint (facultative) #}
 {# set attr (facultative) #}
 
-{% set displayOwned = displayOwned|default(false) %}
 {% set flat = flat|default(false) %}
 {% set noColor = noColor|default(false) %}
 {% set noPrint = noPrint|default(false) %}
 
 {% for materialOrigin in materialOrigins %}
-    {% if materialOrigin > 1 or displayOwned %}  {# OWNED origin are ignored #}
+    {% if materialOrigin > 1 %}  {# OWNED origin are ignored #}
         {% if flat %}
             <div class="media">
                 <div class="media-left" style="width: 40px;"><i class="ladb-opencutlist-icon-material-origin-{{ materialOrigin }} ladb-opencutlist-icon-lg{% if not noColor %} ladb-color-info{% endif %}"></i></div>

src/ladb_opencutlist/twig/tabs/cutlist/_modal-part.twig

@@ -56,7 +56,7 @@
                     </div>
                 {% endif %}
                 <div class="form-group">
-                    <div class="ladb-minitools ladb-minitools-right ladb-minitools-lgw">{% include 'tabs/cutlist/_material-origins.twig' with { 'materialOrigins':part.material_origins, 'displayOwned':true, 'flat':false, 'noColor':true } %}</div>
+                    <div class="ladb-minitools ladb-minitools-right ladb-minitools-lgw">{% include 'tabs/cutlist/_material-origins.twig' with { 'materialOrigins':part.material_origins, 'flat':false, 'noColor':true } %}</div>
                     <label class="control-label col-xs-3">{{ 'tab.cutlist.edit_part.material'|i18next }}</label>
                     <div class="col-xs-7">
                         <select class="form-control" id="ladb_cutlist_part_select_material_name">
@@ -483,7 +483,7 @@
         {% if not multiple and not part.virtual %}
             <div role="tabpanel" class="tab-pane row{% if tab == 'infos_warnings' %} active{% endif %}" id="tab_edit_part_infos_warnings">
                 <div class="col-sm-offset-1 col-sm-10">
-                    {% include 'tabs/cutlist/_material-origins.twig' with { 'materialOrigins':part.material_origins, 'displayOwned':true, 'flat':true } %}
+                    {% include 'tabs/cutlist/_material-origins.twig' with { 'materialOrigins':part.material_origins, 'flat':true } %}
                     {% if part.instance_count_by_part > 1 %}
                         <div class="media">
                             <div class="media-left"><i class="ladb-opencutlist-icon-instance-count-by-part ladb-opencutlist-icon-lg ladb-color-info"></i></div>

src/ladb_opencutlist/twig/tabs/materials/_list.twig

@@ -30,7 +30,7 @@
                         {% endif %}
                         {{ material.display_name|escape }}
                         {% if material.attributes.description is not empty %}
-                            <div class="ladb-tiny">{{ material.attributes.description|nl2br|truncate(25) }}</div>
+                            <div class="ladb-tiny">{{ material.attributes.description|truncate(25)|nl2br }}</div>
                         {% endif %}
                     </div>
                     {% if material.colorized %}