mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats 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",
"description": "Description of the media permission description"
},
"spellCheckDirty": {
"message": "You must restart Signal to apply your new settings",
"description": "Shown when the user changes their spellcheck setting to indicate that they must restart Signal."
"spellCheckWillBeEnabled": {
"message": "Spell check will be enabled the next time Signal starts.",
"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": {
"message": "Clear Data",

8
js/views/settings_view.js
View file

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

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

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