mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use multiple spellCheckDirty messages

Browse source
This commit is contained in:
Ken Powers 2020-03-25 11:16:10 -04:00 • committed by GitHub
parent d33cc9d554
commit c780c12df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
_locales/en/messages.json
View file

@ -1088,9 +1088,13 @@
"message": "Enable spell check of text entered in message composition box", "message": "Enable spell check of text entered in message composition box",
"description": "Description of the media permission description" "description": "Description of the media permission description"
}, },
"spellCheckDirty": { "spellCheckWillBeEnabled": {
"message": "You must restart Signal to apply your new settings", "message": "Spell check will be enabled the next time Signal starts.",
"description": "Shown when the user changes their spellcheck setting to indicate that they must restart Signal." "description": "Shown when the user enables spellcheck to indicate that they must restart Signal."
},
"spellCheckWillBeDisabled": {
"message": "Spell check will be disabled the next time Signal starts.",
"description": "Shown when the user disables spellcheck to indicate that they must restart Signal."
}, },
"clearDataHeader": { "clearDataHeader": {
"message": "Clear Data", "message": "Clear Data",

8
js/views/settings_view.js
View file

@ -141,9 +141,9 @@
'click .clear-data': 'onClearData', 'click .clear-data': 'onClearData',
}, },
render_attributes() { render_attributes() {
const appStartSpellCheck = window.appStartInitialSpellcheckSetting;
const spellCheckDirty = const spellCheckDirty =
window.initialData.spellCheck !== window.initialData.spellCheck !== appStartSpellCheck;
window.appStartInitialSpellcheckSetting;
return { return {
deviceNameLabel: i18n('deviceName'), deviceNameLabel: i18n('deviceName'),
@ -173,7 +173,9 @@
spellCheckDescription: i18n('spellCheckDescription'), spellCheckDescription: i18n('spellCheckDescription'),
spellCheckHidden: spellCheckDirty ? 'false' : 'true', spellCheckHidden: spellCheckDirty ? 'false' : 'true',
spellCheckDisplay: spellCheckDirty ? 'inherit' : 'none', spellCheckDisplay: spellCheckDirty ? 'inherit' : 'none',
spellCheckDirtyText: i18n('spellCheckDirty'), spellCheckDirtyText: appStartSpellCheck
? i18n('spellCheckWillBeDisabled')
: i18n('spellCheckWillBeEnabled'),
}; };
}, },
onClose() { onClose() {

16
ts/util/lint/exceptions.json
View file

@ -928,36 +928,36 @@
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/settings_view.js", "path": "js/views/settings_view.js",
"line": " this.$('.sync').text(i18n('syncNow'));", "line": " this.$('.sync').text(i18n('syncNow'));",
"lineNumber": 198, "lineNumber": 200,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2020-03-20T19:55:50.800Z", "updated": "2020-03-25T13:52:04.149Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/settings_view.js", "path": "js/views/settings_view.js",
"line": " this.$('.sync').attr('disabled', 'disabled');", "line": " this.$('.sync').attr('disabled', 'disabled');",
"lineNumber": 202, "lineNumber": 204,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2020-03-20T19:55:50.800Z", "updated": "2020-03-25T13:52:04.149Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/settings_view.js", "path": "js/views/settings_view.js",
"line": " this.$('.synced_at').hide();", "line": " this.$('.synced_at').hide();",
"lineNumber": 214, "lineNumber": 216,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2020-03-20T19:55:50.800Z", "updated": "2020-03-25T13:52:04.149Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {
"rule": "jQuery-$(", "rule": "jQuery-$(",
"path": "js/views/settings_view.js", "path": "js/views/settings_view.js",
"line": " this.$('.sync_failed').hide();", "line": " this.$('.sync_failed').hide();",
"lineNumber": 219, "lineNumber": 221,
"reasonCategory": "usageTrusted", "reasonCategory": "usageTrusted",
"updated": "2020-03-20T19:55:50.800Z", "updated": "2020-03-25T13:52:04.149Z",
"reasonDetail": "Protected from arbitrary input" "reasonDetail": "Protected from arbitrary input"
}, },
{ {