luci-base: cbi.js: handle translation contexts in _()

[project/luci.git] / modules / luci-base / htdocs / luci-static / resources / cbi.js

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index d962a1d1af49fe10f62efc04d1d63ace50153b5e..2dba54750d230300b600f1c7f5be2ebdec4328c7 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -101,7 +101,8 @@ function trimws(s) {
 }
 
 function _(s, c) {
-       return (window.TR && TR[sfh(trimws(s))]) || s;
+       var k = (c != null ? trimws(c) + '\u0001' : '') + trimws(s);
+       return (window.TR && TR[sfh(k)]) || s;
 }
 
 function N_(n, s, p, c) {