From 42eb17e7e021476227b846d45cc43409aa451b6e Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 22 Feb 2018 10:25:11 +0100
Subject: i18n fixes

---
 tooling/pogen/pogen.js | 12 +++---------
 tooling/pogen/pogen.ts | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'tooling/pogen')

diff --git a/tooling/pogen/pogen.js b/tooling/pogen/pogen.js
index 787a7ec7e..ed634ef0d 100644
--- a/tooling/pogen/pogen.js
+++ b/tooling/pogen/pogen.js
@@ -188,14 +188,8 @@ function processFile(sourceFile) {
                 case ts.SyntaxKind.JsxText:
                     {
                         var e = childNode;
-                        var s = e.getText();
-                        var t = s.split("\n").map(trim).join("\n");
-                        if (s.length >= 1 && (s[0] === "\n" || s[0] === " ")) {
-                            t = " " + t;
-                        }
-                        if (s.length >= 1 && (s[s.length - 1] === "\n" || s[s.length - 1] === " ")) {
-                            t = t + " ";
-                        }
+                        var s = e.getFullText();
+                        var t = s.split("\n").map(trim).join(" ");
                         fragments.push(t);
                     }
                 case ts.SyntaxKind.JsxOpeningElement:
@@ -218,7 +212,7 @@ function processFile(sourceFile) {
             }
         };
         ts.forEachChild(node, process);
-        return fragments.join("");
+        return fragments.join("").trim().replace(/ +/g, " ");
     }
     function getJsxSingular(node) {
         var res;
diff --git a/tooling/pogen/pogen.ts b/tooling/pogen/pogen.ts
index 0903b9db7..391843912 100644
--- a/tooling/pogen/pogen.ts
+++ b/tooling/pogen/pogen.ts
@@ -211,14 +211,8 @@ export function processFile(sourceFile: ts.SourceFile) {
         case ts.SyntaxKind.JsxText:
         {
           let e = childNode as ts.JsxText;
-          let s = e.getText();
-          let t = s.split("\n").map(trim).join("\n");
-          if (s.length >= 1 && (s[0] === "\n" || s[0] === " ")) {
-            t = " " + t;
-          }
-          if (s.length >= 1 && (s[s.length-1] === "\n" || s[s.length-1] === " ")) {
-            t = t + " ";
-          }
+          let s = e.getFullText();
+          let t = s.split("\n").map(trim).join(" ");
           fragments.push(t);
         }
         case ts.SyntaxKind.JsxOpeningElement:
@@ -241,7 +235,7 @@ export function processFile(sourceFile: ts.SourceFile) {
       }
     };
     ts.forEachChild(node, process);
-    return fragments.join("");
+    return fragments.join("").trim().replace(/ +/g, " ");
   }
 
   function getJsxSingular(node: ts.Node) {
-- 
cgit v1.2.3