luci-base: cbi.js: collapse whitespace before language string hashing

To mirror the behavior of the Lua runtime, we need to collapse whitepace
in translation source strings before doing the string table lookup.

Signed-off-by: Jo-Philipp Wich <[email protected]>
(cherry picked from commit aca2c4ba4e4c847e5ae86e5539537f213678a0f3)

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 4c3128bfd12272027c9f4deca9b6e7068086a18d..ff198027e37df4dd7f72f7dec6fe881e62bf3752 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -95,7 +95,7 @@ function sfh(s) {
 }
 
 function _(s) {
-       return (window.TR && TR[sfh(s)]) || s;
+       return (window.TR && TR[sfh(String(s).trim().replace(/[ \t\n]+/g, ' '))]) || s;
 }