@companieshouse/ch-node-utils 1.3.16 → 1.3.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -9,12 +9,12 @@ const log_1 = tslib_1.__importDefault(require("../utils/log"));
|
|
|
9
9
|
const sessionUtils_1 = require("../utils/sessionUtils");
|
|
10
10
|
function LocalesMiddleware() {
|
|
11
11
|
return (req, res, next) => {
|
|
12
|
-
var _a;
|
|
12
|
+
var _a, _b, _c, _d;
|
|
13
13
|
(0, log_1.default)("---------- LocalesMiddleware ------------");
|
|
14
|
-
let lang =
|
|
15
|
-
req.body.lang ||
|
|
16
|
-
((
|
|
17
|
-
(0, log_1.default)(`LocalesMiddleware ....(init with received values: lang=${lang}) - body:${req.body.lang})`);
|
|
14
|
+
let lang = req.query[constants_1.QUERY_PAR_LANG] ||
|
|
15
|
+
((_a = req.body) === null || _a === void 0 ? void 0 : _a.lang) ||
|
|
16
|
+
((_b = req.session) === null || _b === void 0 ? void 0 : _b.getExtraData(constants_1.QUERY_PAR_LANG));
|
|
17
|
+
(0, log_1.default)(`LocalesMiddleware ....(init with received values: lang=${lang}) - body:${(_d = (_c = req.body) === null || _c === void 0 ? void 0 : _c.lang) !== null && _d !== void 0 ? _d : 'N/A'})`);
|
|
18
18
|
if (lang === undefined || !languageNames_1.default.isSupportedLocale(locales_service_1.default.getInstance().localesFolder, lang)) {
|
|
19
19
|
lang = "en";
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manageLocales.middleware.js","sourceRoot":"","sources":["../../src/middleware/manageLocales.middleware.ts"],"names":[],"mappings":";;;;AACA,sDAAuD;AACvD,kGAAgE;AAChE,mFAAkD;AAClD,+DAA+B;AAC/B,wDAA0D;AAE1D,SAAgB,iBAAiB;IAC7B,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;;QAEvD,IAAA,aAAG,EAAC,2CAA2C,CAAC,CAAA;QAChD,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"manageLocales.middleware.js","sourceRoot":"","sources":["../../src/middleware/manageLocales.middleware.ts"],"names":[],"mappings":";;;;AACA,sDAAuD;AACvD,kGAAgE;AAChE,mFAAkD;AAClD,+DAA+B;AAC/B,wDAA0D;AAE1D,SAAgB,iBAAiB;IAC7B,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;;QAEvD,IAAA,aAAG,EAAC,2CAA2C,CAAC,CAAA;QAChD,IAAI,IAAI,GACK,GAAG,CAAC,KAAK,CAAC,0BAAc,CAAE;aACnC,MAAA,GAAG,CAAC,IAAI,0CAAE,IAAI,CAAA;aACd,MAAA,GAAG,CAAC,OAAO,0CAAE,YAAY,CAAS,0BAAc,CAAC,CAAA,CAAC;QAClD,IAAA,aAAG,EAAC,0DAA0D,IAAI,YAAY,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,IAAI,mCAAI,KAAK,GAAG,CAAC,CAAA;QAC7G,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,uBAAa,CAAC,iBAAiB,CAAC,yBAAc,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC;YAC3G,IAAI,GAAG,IAAI,CAAA;QACf,CAAC;QACD,IAAA,aAAG,EAAC,uCAAuC,IAAI,GAAG,CAAC,CAAA;QACnD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACd,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,0BAAc,EAAE,IAAI,CAAC,CAAA;QAClD,CAAC;QACD,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;QAEf,IAAI,UAAU,GAAG,GAAG,CAAC,GAAG,CAAA;QACxB,IAAI,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,CAAC;YAIlD,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,WAAW,GAAG,CAAC,GAAG,EAAE,CAAC,CAAA;YACxC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,0BAAc,CAAC,CAAA;YACxC,UAAU,GAAG,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;YAC7C,IAAA,aAAG,EAAC,gCAAgC,0BAAc,2BAA2B,UAAU,GAAG,CAAC,CAAA;QAC/F,CAAC;QAED,GAAG,CAAC,GAAG,GAAG,UAAU,CAAA;QACpB,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,GAAG,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,UAAU,EAAE,CAAA;QAG3E,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAA;QAC1B,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAA;QAC/B,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAA;QAG1B,IAAI,IAAA,gCAAiB,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,MAAM,CAAC,sBAAsB,GAAG,KAAK,CAAC;QAC9C,CAAC;QAED,OAAO,IAAI,EAAE,CAAA;IACjB,CAAC,CAAA;AACL,CAAC;AA5CD,8CA4CC"}
|
package/package.json
CHANGED
package/templates/navbar.njk
CHANGED
|
@@ -32,17 +32,22 @@ It receives:
|
|
|
32
32
|
<div class="js-toggle-nav" id="global-nav">
|
|
33
33
|
<nav role="navigation" class="content" aria-label="{{ lang.mainNavbar }}">
|
|
34
34
|
{% if userDisplayText %}
|
|
35
|
-
<
|
|
35
|
+
<button type="button" class="js-header-toggle menu" aria-expanded="false" aria-controls="navigation">
|
|
36
|
+
{{ userDisplayText }}
|
|
36
37
|
<span class="govuk-visually-hidden">{{ lang.clickToExpandOrCollapse }}</span>
|
|
37
|
-
</
|
|
38
|
+
</button>
|
|
38
39
|
{% else %}
|
|
39
|
-
<a id="user-signin-mobile" href="{{ signInHref }}" class="sign-in govuk-link">
|
|
40
|
+
<a id="user-signin-mobile" href="{{ signInHref }}" class="sign-in govuk-link">
|
|
41
|
+
{{ lang.signInOrRegister or 'Sign in / Register' }}
|
|
42
|
+
</a>
|
|
40
43
|
{% endif %}
|
|
41
44
|
|
|
42
|
-
<ul id="navigation">
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
45
|
+
<ul id="navigation" class="nav-menu" hidden>
|
|
46
|
+
{% if userDisplayText %}
|
|
47
|
+
<li id="signed-in-user" class="user" aria-hidden="true">
|
|
48
|
+
{{ userDisplayText }}
|
|
49
|
+
</li>
|
|
50
|
+
{% endif %}
|
|
46
51
|
{% for item in menuItems %}
|
|
47
52
|
<li>
|
|
48
53
|
<a class="govuk-link" id="{{ item.id }}" href="{{ item.href }}">{{ item.displayText }}</a>
|