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

Refactor locale to only expose the data we care about

Browse source
This commit is contained in:
David Balatero 2017-06-21 18:13:36 -07:00 • committed by Scott Nonnenberg
parent 5e5ca80a6e
commit ceaff68d55
No known key found for this signature in database
GPG key ID: A4931C09644C654B
3 changed files with 50 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

49
app/autoupdate.js
View file

@ -1,7 +1,8 @@
const autoUpdater = require('electron-updater').autoUpdater
const { dialog } = require('electron');
const config = require('./config');
const config = require('./config');
const locale = require('./locale');
const windowState = require('./window_state');
const hour = 60 * 60;
@ -18,42 +19,38 @@ function checkForUpdates() {
autoUpdater.checkForUpdates();
}
function showUpdateDialog(localeMessages) {
return function() {
const options = {
type: 'info',
buttons: [
localeMessages.autoUpdateRestartButtonLabel.message,
localeMessages.autoUpdateLaterButtonLabel.message
],
title: localeMessages.autoUpdateNewVersionTitle.message,
message: localeMessages.autoUpdateNewVersionMessage.message,
detail: localeMessages.autoUpdateNewVersionInstructions.message,
defaultId: RESTART_BUTTON,
cancelId: LATER_BUTTON
}
dialog.showMessageBox(options, function(response) {
if (response == RESTART_BUTTON) {
windowState.markShouldQuit();
autoUpdater.quitAndInstall();
}
});
function showUpdateDialog() {
const options = {
type: 'info',
buttons: [
locale.messages.autoUpdateRestartButtonLabel.message,
locale.messages.autoUpdateLaterButtonLabel.message
],
title: locale.messages.autoUpdateNewVersionTitle.message,
message: locale.messages.autoUpdateNewVersionMessage.message,
detail: locale.messages.autoUpdateNewVersionInstructions.message,
defaultId: RESTART_BUTTON,
cancelId: LATER_BUTTON
}
dialog.showMessageBox(options, function(response) {
if (response == RESTART_BUTTON) {
windowState.markShouldQuit();
autoUpdater.quitAndInstall();
}
});
}
function onError(error) {
console.log("Got an error while updating: ", error.stack);
}
function initializeAutoUpdater(localeMessages) {
function initializeAutoUpdater() {
if (autoUpdateDisabled()) {
return;
}
const onUpdateDownloaded = showUpdateDialog(localeMessages);
autoUpdater.addListener('update-downloaded', onUpdateDownloaded);
autoUpdater.addListener('update-downloaded', showUpdateDialog);
autoUpdater.addListener('error', onError);
checkForUpdates();

25
app/locale.js
View file

@ -1,5 +1,6 @@
const path = require('path');
const fs = require('fs');
const app = require('electron').app;
function normalizeLocaleName(locale) {
if (/^en-/.test(locale)) {
@ -23,7 +24,25 @@ function getLocaleMessages(locale) {
return JSON.parse(fs.readFileSync(targetFile, 'utf-8'))
}
module.exports = {
normalizeLocaleName,
getLocaleMessages
// Load locale - if we can't load messages for the current locale, we
// default to 'en'
//
// possible locales:
// https://github.com/electron/electron/blob/master/docs/api/locales.md
let localeName = normalizeLocaleName(app.getLocale());
let messages;
try {
messages = getLocaleMessages(localeName);
} catch (e) {
console.log('Problem loading messages for locale ', localeName, e.stack);
console.log('Falling back to en locale');
localeName = 'en';
messages = getLocaleMessages(localeName);
}
module.exports = {
name: localeName,
messages
}