Merge pull request #856 from mattermost/jasonblais-en-us

MM-11910: Add a '[US]' to the word 'English' in the dictionary, and add Portuguese to settings helps text list
This commit is contained in:
Yuya Ochiai
2018-08-31 21:42:48 +09:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -417,7 +417,7 @@ const SettingsPage = createReactClass({
{'Check spelling'} {'Check spelling'}
<HelpBlock> <HelpBlock>
{'Highlight misspelled words in your messages.'} {'Highlight misspelled words in your messages.'}
{' Available for English, French, German, Spanish, and Dutch.'} {' Available for English, French, German, Portuguese, Spanish, and Dutch.'}
</HelpBlock> </HelpBlock>
</Checkbox>); </Checkbox>);

View File

@@ -22,7 +22,7 @@ function getSuggestionsMenus(win, suggestions) {
function getSpellCheckerLocaleMenus(onSelectSpellCheckerLocale) { function getSpellCheckerLocaleMenus(onSelectSpellCheckerLocale) {
const currentLocale = ipcRenderer.sendSync('get-spellchecker-locale'); const currentLocale = ipcRenderer.sendSync('get-spellchecker-locale');
const locales = [ const locales = [
{language: 'English', locale: 'en-US'}, {language: 'English (US)', locale: 'en-US'},
{language: 'French', locale: 'fr-FR'}, {language: 'French', locale: 'fr-FR'},
{language: 'German', locale: 'de-DE'}, {language: 'German', locale: 'de-DE'},
{language: 'Spanish', locale: 'es-ES'}, {language: 'Spanish', locale: 'es-ES'},