From 583fdfbb9fe1004e8d541082b3bbabdf80e26456 Mon Sep 17 00:00:00 2001 From: turt2live Date: Tue, 30 May 2017 13:11:57 -0600 Subject: [PATCH 1/5] Support 12hr time in full date Signed-off-by: Travis Ralston --- src/DateUtils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DateUtils.js b/src/DateUtils.js index 015b645fa8..0bce7c8a16 100644 --- a/src/DateUtils.js +++ b/src/DateUtils.js @@ -83,7 +83,7 @@ module.exports = { return this.formatFullDate(date); }, - formatFullDate: function(date) { + formatFullDate: function(date, showTwelveHour=false) { const days = getDaysArray(); const months = getMonthsArray(); return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s', { @@ -91,7 +91,7 @@ module.exports = { monthName: months[date.getMonth()], day: date.getDate(), fullYear: date.getFullYear(), - time: this.formatTime(date), + time: showTwelveHour ? twelveHourTime(date) : this.formatTime(date), }); }, From 5a4ec1996d9f2ead19ac7b354fb2708cb954438a Mon Sep 17 00:00:00 2001 From: daniel tygel Date: Tue, 30 May 2017 16:29:50 -0300 Subject: [PATCH 2/5] fix error in i18n string --- src/components/views/messages/TextualBody.js | 4 ++-- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js index 83a35b9841..aff6725475 100644 --- a/src/components/views/messages/TextualBody.js +++ b/src/components/views/messages/TextualBody.js @@ -235,8 +235,8 @@ module.exports = React.createClass({ description:
{_t("You are about to be taken to a third-party site so you can " + - "authenticate your account for use with {integrationsUrl}. " + - "Do you wish to continue?")} + "authenticate your account for use with %(integrationsUrl)s. " + + "Do you wish to continue?", {integrationsUrl: integrationsUrl})}
, button: _t("Continue"), onFinished: function(confirmed) { diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 4cf16b3d5d..051a84bd10 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -751,7 +751,7 @@ "This image cannot be displayed.": "This image cannot be displayed.", "Error decrypting video": "Error decrypting video", "Add an Integration": "Add an Integration", - "You are about to be taken to a third-party site so you can authenticate your account for use with {integrationsUrl}. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with {integrationsUrl}. Do you wish to continue?", + "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?", "Removed or unknown message type": "Removed or unknown message type", "Disable URL previews by default for participants in this room": "Disable URL previews by default for participants in this room", "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.", From 48a2ad93da669c717b63ece5ef9a523e2a7ff879 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 30 May 2017 20:32:12 +0100 Subject: [PATCH 3/5] fix {integrationsUrl} thinko --- src/components/views/messages/TextualBody.js | 4 ++-- src/i18n/strings/de_DE.json | 2 +- src/i18n/strings/en_EN.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js index 83a35b9841..9595c2b850 100644 --- a/src/components/views/messages/TextualBody.js +++ b/src/components/views/messages/TextualBody.js @@ -235,8 +235,8 @@ module.exports = React.createClass({ description:
{_t("You are about to be taken to a third-party site so you can " + - "authenticate your account for use with {integrationsUrl}. " + - "Do you wish to continue?")} + "authenticate your account for use with %(integrationsUrl)s. " + + "Do you wish to continue?", { integrationsUrl: integrationsUrl })}
, button: _t("Continue"), onFinished: function(confirmed) { diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index 9046372849..178c324941 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -819,5 +819,5 @@ "Idle": "inaktiv", "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen dir für jedes Gerät durch den Verifizierungsprozess zu gehen um zu bestätigen, dass sie ihrem legitimierten Besitzer gehören, aber du kannst die Nachrichten ohne Verifizierung erneut senden, wenn du es vorziehst.", "Ongoing conference call%(supportedText)s. %(joinText)s": "Laufendes Konferenzgespräch%(supportedText)s. %(joinText)s", - "You are about to be taken to a third-party site so you can authenticate your account for use with {integrationsUrl}. Do you wish to continue?": "Du wirst jetzt auf eine Drittanbieter-Website weitergeleitet, damit du dein Konto authentifizieren kannst für die Verwendung mit {integrationsUrl}. Möchtest du fortfahren?" + "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf eine Drittanbieter-Website weitergeleitet, damit du dein Konto authentifizieren kannst für die Verwendung mit %(integrationsUrl)s. Möchtest du fortfahren?" } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 4cf16b3d5d..051a84bd10 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -751,7 +751,7 @@ "This image cannot be displayed.": "This image cannot be displayed.", "Error decrypting video": "Error decrypting video", "Add an Integration": "Add an Integration", - "You are about to be taken to a third-party site so you can authenticate your account for use with {integrationsUrl}. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with {integrationsUrl}. Do you wish to continue?", + "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?", "Removed or unknown message type": "Removed or unknown message type", "Disable URL previews by default for participants in this room": "Disable URL previews by default for participants in this room", "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.", From 4d7ac1b828e6c260c4479ba4ad678715e76735e5 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 30 May 2017 21:46:07 +0200 Subject: [PATCH 4/5] Fix missing string in the room settings --- src/i18n/strings/en_EN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 051a84bd10..d8fa30b1bc 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -762,5 +762,6 @@ "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s", "Online": "Online", "Idle": "Idle", - "Offline": "Offline" + "Offline": "Offline", + "Disable URL previews for this room (affects only you)"; "Disable URL previews for this room (affects only you)" } From 54b8afec3826a87a2a076d63c8b6be0bee418f42 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 30 May 2017 21:47:38 +0200 Subject: [PATCH 5/5] Fix use of wrong char --- src/i18n/strings/en_EN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index d8fa30b1bc..0dc634d466 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -763,5 +763,5 @@ "Online": "Online", "Idle": "Idle", "Offline": "Offline", - "Disable URL previews for this room (affects only you)"; "Disable URL previews for this room (affects only you)" + "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)" }