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

Remove formatting in importError localization string

Browse source
This commit is contained in:
Scott Nonnenberg 2018-05-21 11:57:40 -07:00
parent ab00c71c46
commit 01be58acc2
4 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
_locales/en/messages.json
View file

@ -67,9 +67,13 @@
"message": "Loading contacts and messages", "message": "Loading contacts and messages",
"description": "Header of screen shown as data is import" "description": "Header of screen shown as data is import"
}, },
"importError": { "importErrorFirst": {
"message": "Make sure you have chosen the correct directory that contains your saved Signal data. Its name should begin with 'Signal Export.' You can also save a new copy of your data from the Chrome App.<p>If these steps don't work for you, please <a target='_blank' href='https://support.signal.org/hc/en-us/articles/215188737'>submit a debug log</a> so that we can help you get migrated!</p>", "message": "Make sure you have chosen the correct directory that contains your saved Signal data. Its name should begin with 'Signal Export.' You can also save a new copy of your data from the Chrome App.",
"description": "Message shown if the import went wrong." "description": "Message shown if the import went wrong; first paragraph"
},
"importErrorSecond": {
"message": "If these steps don't work for you, please submit a debug log (View -> Debug Log) so that we can help you get migrated!",
"description": "Message shown if the import went wrong; second paragraph"
}, },
"importAgain": { "importAgain": {
"message": "Choose folder and try again", "message": "Choose folder and try again",

5
background.html
View file

@ -740,7 +740,10 @@
<div class='step-body'> <div class='step-body'>
<span class='banner-icon alert-outline'></span> <span class='banner-icon alert-outline'></span>
<div class='header'>{{ errorHeader }}</div> <div class='header'>{{ errorHeader }}</div>
<div class='body-text-wide'>{{& errorMessage }}</div> <div class='body-text-wide'>
{{ errorMessageFirst }}
<p>{{ errorMessageSecond }}</p>
</div>
</div> </div>
<div class='nav'> <div class='nav'>
<div> <div>

3
js/views/import_view.js
View file

@ -58,7 +58,8 @@
return { return {
isError: true, isError: true,
errorHeader: i18n('importErrorHeader'), errorHeader: i18n('importErrorHeader'),
errorMessage: i18n('importError'), errorMessageFirst: i18n('importErrorFirst'),
errorMessageSecond: i18n('importErrorSecond'),
chooseButton: i18n('importAgain'), chooseButton: i18n('importAgain'),
}; };
} }

7
test/i18n_test.js
View file

@ -11,11 +11,8 @@ describe('i18n', function() {
assert.equal(actual, 'Attempting reconnect in 5 seconds'); assert.equal(actual, 'Attempting reconnect in 5 seconds');
}); });
it('returns message with multiple substitutions', function() { it('returns message with multiple substitutions', function() {
const actual = i18n('verifyContact', ['<strong>', '</strong>']); const actual = i18n('theyChangedTheTimer', ['Someone', '5 minutes']);
assert.equal( assert.equal(actual, 'Someone set the timer to 5 minutes.');
actual,
'You may wish to <strong> verify </strong> your safety number with this contact.'
);
}); });
}); });