Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3547 from atjn/meridian-force 

Support forced meridians
master
Gordon Williams 2024-08-27 14:45:22 +01:00 committed by GitHub
parent 43893bab27 effa1b654a
commit e814704b62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/locale/locale.html
View File

@ -237,7 +237,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 => is12Hours() ? d.getHours() < 12 ? ${js(locale.ampm[0])}:${js(locale.ampm[1])} : "", meridian: (d,force) => (force||is12Hours()) ? d.getHours() < 12 ? ${js(locale.ampm[0])}:${js(locale.ampm[1])} : "",
is12Hours, is12Hours,
}; };
`.trim() `.trim()
@ -310,8 +310,8 @@ ${customizeLocale ? `<tr><td class="table_t">Time format</td>
`; `;
document.getElementById("examples").innerHTML = ` document.getElementById("examples").innerHTML = `
<tr><td class="table_t">Meridian</td><td> <tr><td class="table_t">Meridian</td><td>
<span id="meridian-am-output">${exports.meridian(new Date(0))}</span> / <span id="meridian-am-output">${exports.meridian(new Date(0), true)}</span> /
<span id="meridian-pm-output">${exports.meridian(new Date(43200000))}</span> <span id="meridian-pm-output">${exports.meridian(new Date(43200000), true)}</span>
</td></tr> </td></tr>
${customizeLocale ? `<tr><td class="table_t">Meridian names</td> ${customizeLocale ? `<tr><td class="table_t">Meridian names</td>
<td> <td>