fixed meridian
parent
b5f0cc4851
commit
689de1e2ed
|
|
@ -151,8 +151,8 @@ exports = { name : "en_GB", currencySym:"£",
|
||||||
"%a": "abday.split(',')[d.getDay()]",
|
"%a": "abday.split(',')[d.getDay()]",
|
||||||
"%B": "month.split(',')[d.getMonth()]",
|
"%B": "month.split(',')[d.getMonth()]",
|
||||||
"%b": "abmonth.split(',')[d.getMonth()]",
|
"%b": "abmonth.split(',')[d.getMonth()]",
|
||||||
"%p": `(d.getHours()<12)?${js(locale.ampm[0].toUpperCase())}:${js(locale.ampm[1].toUpperCase())}`,
|
"%p": `d.getHours()<12?${js(locale.ampm[0].toUpperCase())}:${js(locale.ampm[1].toUpperCase())}`,
|
||||||
"%P": `(d.getHours()<12)?${js(locale.ampm[0].toLowerCase())}:${js(locale.ampm[1].toLowerCase())}`
|
"%P": `d.getHours()<12?${js(locale.ampm[0].toLowerCase())}:${js(locale.ampm[1].toLowerCase())}`
|
||||||
};
|
};
|
||||||
|
|
||||||
var timeN = locales[lang].timePattern[0];
|
var timeN = locales[lang].timePattern[0];
|
||||||
|
|
@ -188,7 +188,7 @@ exports = {
|
||||||
translate: s => ${locale.trans?`{var t=${js(locale.trans)};s=''+s;return t[s]||t[s.toLowerCase()]||s;}`:`s`},
|
translate: s => ${locale.trans?`{var t=${js(locale.trans)};s=''+s;return t[s]||t[s.toLowerCase()]||s;}`:`s`},
|
||||||
date: (d,short) => short ? \`${dateS}\` : \`${dateN}\`,
|
date: (d,short) => short ? \`${dateS}\` : \`${dateN}\`,
|
||||||
time: (d,short) => short ? \`${timeS}\` : \`${timeN}\`,
|
time: (d,short) => short ? \`${timeS}\` : \`${timeN}\`,
|
||||||
meridian: d => (d.getHours() <= 12) ? ${js(locale.ampm[0])}:${js(locale.ampm[1])},
|
meridian: d => d.getHours() < 12 ? ${js(locale.ampm[0])}:${js(locale.ampm[1])},
|
||||||
};
|
};
|
||||||
`.trim();
|
`.trim();
|
||||||
console.log("Locale Module is:",localeModule);
|
console.log("Locale Module is:",localeModule);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue