From 0a1d96ea22cbd46fa1a9b02ad36a4ca77d4fdaee Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Mon, 27 Aug 2018 16:45:03 +0200
Subject: [PATCH] :sparkles: Added support for xml:lang attribute in SVG tag

---
 src/pattern.js           |  7 +++---
 src/svg.js               |  1 +
 tests/fixtures/render.js | 53 +++++++++++++++++++++++++++++++---------
 tests/pattern.test.js    |  2 +-
 tests/svg.test.js        |  6 +++++
 5 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/pattern.js b/src/pattern.js
index 9337ccf31fd..540e82e7701 100644
--- a/src/pattern.js
+++ b/src/pattern.js
@@ -22,7 +22,9 @@ export default function Pattern(config = false) {
   // Data containers
   this.settings = {
     mode: "draft",
-    idPrefix: "fs-"
+    idPrefix: "fs-",
+    locale: "en",
+    units: "metric"
   };
   this.options = {};
   this.store = new Store();
@@ -31,8 +33,7 @@ export default function Pattern(config = false) {
   // Merge config with defaults
   let defaults = {
     measurements: {},
-    options: {},
-    units: "metric"
+    options: {}
   };
   this.config = { ...defaults, ...config };
   for (let i in config.options) {
diff --git a/src/svg.js b/src/svg.js
index 36f8c61dc05..7462b0b0c1a 100644
--- a/src/svg.js
+++ b/src/svg.js
@@ -18,6 +18,7 @@ function Svg(pattern) {
   this.attributes.add("xmlns", "http://www.w3.org/2000/svg");
   this.attributes.add("xmlns:svg", "http://www.w3.org/2000/svg");
   this.attributes.add("xmlns:xlink", "http://www.w3.org/1999/xlink");
+  this.attributes.add("xml:lang", pattern.settings.locale);
   this.attributes.add(
     "xmlns:freesewing",
     "http://freesewing.org/namespaces/freesewing"
diff --git a/tests/fixtures/render.js b/tests/fixtures/render.js
index 7db4f8960ed..4155c019e45 100644
--- a/tests/fixtures/render.js
+++ b/tests/fixtures/render.js
@@ -6,7 +6,36 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="0mm" height="0mm" viewBox="0 0 0 0"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="0mm" height="0mm" viewBox="0 0 0 0"
+>
+<style type="text/css"> <![CDATA[
+
+]]>
+</style>
+<script type="text/javascript"> <![CDATA[
+
+]]>
+</script>
+<defs>
+
+</defs>
+
+
+<!-- Start of group #fs-container -->
+<g id="fs-container">
+</g>
+<!-- end of group #fs-container -->
+</svg>
+
+<!--
+
+-->`,
+  boilerplateNl: `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!--
+
+--><svg
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="nl" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="0mm" height="0mm" viewBox="0 0 0 0"
 >
 <style type="text/css"> <![CDATA[
 
@@ -35,7 +64,7 @@ var render = {
     <!--
 
     --><svg
-     xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" viewBox="0 0 0 0"
+     xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" viewBox="0 0 0 0"
      >
      <style type="text/css"> <![CDATA[
 
@@ -64,7 +93,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
 >
 <style type="text/css"> <![CDATA[
 
@@ -98,7 +127,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
 >
 <style type="text/css"> <![CDATA[
 
@@ -133,7 +162,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
 >
 <style type="text/css"> <![CDATA[
 
@@ -169,7 +198,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="120mm" height="120mm" viewBox="0 0 120 120"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="120mm" height="120mm" viewBox="0 0 120 120"
 >
 <style type="text/css"> <![CDATA[
 
@@ -208,7 +237,7 @@ var render = {
     <!--
 
     --><svg
-     xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
+     xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
      >
      <style type="text/css"> <![CDATA[
 
@@ -244,7 +273,7 @@ var render = {
     <!--
 
     --><svg
-     xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
+     xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
      >
      <style type="text/css"> <![CDATA[
 
@@ -280,7 +309,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
 >
 <style type="text/css"> <![CDATA[
 
@@ -317,7 +346,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
 >
 <style type="text/css"> <![CDATA[
 
@@ -354,7 +383,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="60mm" height="72.45mm" viewBox="0 0 60 72.45"
 >
 <style type="text/css"> <![CDATA[
 
@@ -391,7 +420,7 @@ var render = {
 <!--
 
 --><svg
- xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
+ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:lang="en" xmlns:freesewing="http://freesewing.org/namespaces/freesewing" freesewing="${version}" width="20mm" height="20mm" viewBox="0 0 20 20"
 >
 <style type="text/css"> <![CDATA[
 
diff --git a/tests/pattern.test.js b/tests/pattern.test.js
index 4ce854967c2..87d7cdbc0c4 100644
--- a/tests/pattern.test.js
+++ b/tests/pattern.test.js
@@ -13,7 +13,7 @@ it("Pattern constructor should initialize object", () => {
   expect(pattern.height).to.equal(false);
   expect(pattern.settings.mode).to.equal("draft");
   expect(pattern.parts).to.eql({});
-  expect(pattern.config.units).to.equal("metric");
+  expect(pattern.settings.units).to.equal("metric");
   expect(pattern.config.foo).to.equal("bar");
   expect(pattern.options.constant).to.equal(2);
   expect(pattern.options.percentage).to.equal(0.3);
diff --git a/tests/svg.test.js b/tests/svg.test.js
index 6ce094c0f68..eb46359ad12 100644
--- a/tests/svg.test.js
+++ b/tests/svg.test.js
@@ -39,6 +39,12 @@ it("Should render Svg boilerplate", () => {
   expect(pattern.render()).to.equalIgnoreSpaces(render.boilerplate);
 });
 
+it("Should render language attribute", () => {
+  let pattern = new freesewing.Pattern();
+  pattern.settings.locale = "nl";
+  expect(pattern.render()).to.equalIgnoreSpaces(render.boilerplateNl);
+});
+
 it("Should render Svg boilerplate for embedding", () => {
   let pattern = new freesewing.Pattern();
   pattern.settings.embed = true;