Merge branch 'rc-1.52.0'

This commit is contained in:
Vishwas Shashidhar
2018-06-27 14:47:44 +05:30

View File

@@ -16,6 +16,7 @@ class SpellCheckHelper {
* Method to initialize spell checker * Method to initialize spell checker
*/ */
initializeSpellChecker() { initializeSpellChecker() {
this.spellCheckHandler.automaticallyIdentifyLanguages = false;
this.spellCheckHandler.attachToInput(); this.spellCheckHandler.attachToInput();
// This is only for window as in mac the // This is only for window as in mac the
@@ -24,7 +25,8 @@ class SpellCheckHelper {
// In windows we need to implement RxJS observable // In windows we need to implement RxJS observable
// in order to switch language dynamically // in order to switch language dynamically
if (!isMac) { if (!isMac) {
this.spellCheckHandler.switchLanguage('en-US'); const sysLocale = remote.app.getLocale() || 'en-US';
this.spellCheckHandler.switchLanguage(sysLocale);
} }
const contextMenuBuilder = new ContextMenuBuilder(this.spellCheckHandler, null, false, SpellCheckHelper.processMenu); const contextMenuBuilder = new ContextMenuBuilder(this.spellCheckHandler, null, false, SpellCheckHelper.processMenu);