-
-
- Add a new firewall rule
to your Compute Engine project.
- - Type 'outline' in the 'Name' field. -
- Type 'outline' in the 'Target tags' field. -
- Type '0.0.0.0/0' in the 'Source IP ranges' field. -
- Select 'Allow all' under 'Protocols and ports'. -
- Click 'Create'. + +
- [[localize('gcp-firewall-create-1')]] +
- [[localize('gcp-firewall-create-2')]] +
- [[localize('gcp-firewall-create-3')]] +
- [[localize('gcp-firewall-create-4')]] +
- [[localize('gcp-firewall-create-5')]]
@@ -304,13 +305,13 @@
+
- Okay, got it!
+ [[localize('server-help-connection-ok')]]
-
+
- Next
+ [[localize('server-help-access-key-next')]]
@@ -570,6 +574,10 @@
type: Number,
value: 1
},
+ localize: {
+ type: Function,
+ readonly: true
+ },
},
observers: [
'_accessKeysAddedOrRemoved(accessKeyRows.splices)',
@@ -751,10 +759,10 @@
// are initialized before this point, setPosition will not work and
// they will appear in the top left of the view.
initHelpBubbles: function() {
- this.showHelpBubbleOnce('addAccessKeyHelpBubble', 'addAccessKeyRow', 'up', 'left');
+ this.showHelpBubbleOnce('addAccessKeyHelpBubble', 'addAccessKeyRow', 'down', 'left');
},
showHelpBubbleOnce: function(helpBubbleId, positionTargetId,
- arrowDirection='up', arrowAlignment='right') {
+ arrowDirection='down', arrowAlignment='right') {
const storageKey = helpBubbleId + '-dismissed';
if (window.localStorage.getItem(storageKey)) {
// Help bubble has already been dismissed, nothing to show.
diff --git a/src/server_manager/ui_components/outline-share-dialog.html b/src/server_manager/ui_components/outline-share-dialog.html
index 3b81fc0e..15491d87 100644
--- a/src/server_manager/ui_components/outline-share-dialog.html
+++ b/src/server_manager/ui_components/outline-share-dialog.html
@@ -95,38 +95,41 @@
diff --git a/src/server_manager/web_app/app.spec.ts b/src/server_manager/web_app/app.spec.ts
index 00963b2f..7c12cbd2 100644
--- a/src/server_manager/web_app/app.spec.ts
+++ b/src/server_manager/web_app/app.spec.ts
@@ -318,6 +318,7 @@ class FakePolymerAppRoot {
// and throwing an exception would result in breakage.
setAttribute() {}
addEventListener() {}
+ localize() {}
}
class FakeServer implements server.Server {
diff --git a/src/server_manager/web_app/app.ts b/src/server_manager/web_app/app.ts
index 0c5a73a8..f2f3faea 100644
--- a/src/server_manager/web_app/app.ts
+++ b/src/server_manager/web_app/app.ts
@@ -45,23 +45,6 @@ interface UiAccessKey {
relativeTraffic: number;
}
-// Converts the access key from the remote service format to the
-// format used by outline-server-view.
-function convertToUiAccessKey(remoteAccessKey: server.AccessKey): UiAccessKey {
- return {
- id: remoteAccessKey.id,
- placeholderName: 'Key ' + remoteAccessKey.id,
- name: remoteAccessKey.name,
- accessUrl: remoteAccessKey.accessUrl,
- transferredBytes: 0,
- relativeTraffic: 0
- };
-}
-
-const DIGITAL_OCEAN_CREATION_ERROR_MESSAGE = `Sorry! We couldn't create a server this time.
- If this problem persists, it might be that your account needs to be reviewed by DigitalOcean.
- Please log in to www.digitalocean.com and follow their instructions.`;
-
function isManagedServer(testServer: server.Server): testServer is server.ManagedServer {
return !!(testServer as server.ManagedServer).getHost;
}
@@ -145,13 +128,15 @@ export class App {
manualServerEntryEl.clear();
})
.catch((e: Error) => {
- // Remove the "Attempting to connect..." display.
+ // Remove the progress indicator.
manualServerEntryEl.showConnection = false;
// Display either error dialog or feedback depending on error type.
if (e instanceof errors.UnreachableServerError) {
- const errorTitle = 'Unable to connect to your Outline Server';
- this.appRoot.showManualServerError(errorTitle, e.message);
+ const errorTitle = appRoot.localize('error-server-unreachable-title');
+ const errorMessage = appRoot.localize('error-server-unreachable');
+ this.appRoot.showManualServerError(errorTitle, errorMessage);
} else {
+ // TODO(alalama): with UI validation, this code path never gets executed. Remove?
let errorMessage = '';
if (e.message) {
errorMessage += `${e.message}\n`;
@@ -180,9 +165,10 @@ export class App {
user: {email: detail.userEmail},
tags: {category: detail.feedbackCategory, cloudProvider: detail.cloudProvider}
});
- appRoot.showNotification('Thanks for helping us improve! We love hearing from you.');
+ appRoot.showNotification(appRoot.localize('notification-feedback-thanks'));
} catch (e) {
- appRoot.showError('Failed to submit feedback. Please try again.');
+ console.error(`Failed to submit feedback: ${e}`);
+ appRoot.showError(appRoot.localize('error-feedback'));
}
});
@@ -253,8 +239,14 @@ export class App {
this.displayServerRepository.removeServer(displayServer);
}
const unsyncedServerNames = unsyncedServers.map(s => s.name).join(', ');
- this.appRoot.showError(
- `${unsyncedServerNames} no longer present in your DigitalOcean account.`);
+ let messageKey = 'error-server-removed';
+ let placeholder = 'serverName';
+ if (unsyncedServers.length > 1) {
+ // Pluralize localized message.
+ messageKey = 'error-servers-removed';
+ placeholder = 'serverNames';
+ }
+ this.appRoot.showError(this.appRoot.localize(messageKey, placeholder, unsyncedServerNames));
}
await this.syncDisplayServersToUi();
@@ -344,7 +336,7 @@ export class App {
// Set name to the default server name for this region. Because the server
// is still being created, the getName REST API will not yet be available.
const regionId = this.serverBeingCreated.getHost().getRegionId();
- const serverName = digitalocean_server.MakeEnglishNameForServer(regionId);
+ const serverName = this.makeLocalizedServerName(regionId);
return {
// Use the droplet ID until the API URL is available.
id: this.serverBeingCreated.getHost().getHostId(),
@@ -429,9 +421,10 @@ export class App {
.catch((error) => {
if (!cancelled) {
this.showIntro();
- const msg = 'Failed to get DigitalOcean account information';
- this.displayError(msg, error);
- reject(new Error(`${msg}: ${error}`));
+ const msg = `Failed to get DigitalOcean account information: ${error}`;
+ console.error(msg);
+ this.appRoot.showError(this.appRoot.localize('error-do-account-info'));
+ reject(new Error(msg));
}
});
};
@@ -508,7 +501,7 @@ export class App {
} else {
// Server has been deleted outside the app.
this.appRoot.showError(
- `${displayServer.name} no longer present in your DigitalOcean account.`);
+ this.appRoot.localize('error-server-removed', 'serverName', displayServer.name));
this.removeServerFromDisplay(displayServer);
this.selectedServer = null;
this.appRoot.selectedServer = null;
@@ -554,25 +547,13 @@ export class App {
});
};
- private displayError(message: string, cause: Error) {
- console.error(`${message}: ${cause}`);
- this.appRoot.showError(message);
- console.error(message);
- }
-
- private displayNotification(message: string) {
- this.appRoot.showNotification(message);
- }
-
// Shows the intro screen with overview and options to sign in or sign up.
private showIntro() {
this.appRoot.showIntro();
}
private displayAppUpdateNotification() {
- const msg =
- 'An updated version of the Outline Manager has been downloaded. It will be installed when you restart the application.';
- this.appRoot.showToast(msg, 60000);
+ this.appRoot.showNotification(this.appRoot.localize('notification-app-update'), 60000);
}
private connectToDigitalOcean() {
@@ -623,7 +604,8 @@ export class App {
if (!session.isCancelled()) {
this.clearCredentialsAndShowIntro();
bringToFront();
- this.displayError('Authentication with DigitalOcean failed', error);
+ console.error(`DigitalOcean authentication failed: ${error}`);
+ this.appRoot.showError(this.appRoot.localize('error-do-auth'));
}
});
}
@@ -671,7 +653,8 @@ export class App {
regionPicker.availableRegionIds = availableRegionIds;
},
(e) => {
- this.displayError('Failed to get list of available regions', e);
+ console.error(`Failed to get list of available regions: ${e}`);
+ this.appRoot.showError(this.appRoot.localize('error-do-regions'));
});
}
@@ -700,13 +683,15 @@ export class App {
this.serverBeingCreated = null;
return;
}
- const errorMessage = this.serverBeingCreated.isInstallCompleted() ?
- 'We are unable to connect to your Outline server at the moment. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.' :
- 'There was an error creating your Outline server. This may be due to a firewall on your network or temporary connectivity issues with digitalocean.com.';
+ let errorMessage = this.serverBeingCreated.isInstallCompleted() ?
+ this.appRoot.localize('error-server-unreachable-title') :
+ this.appRoot.localize('error-server-creation');
+ errorMessage += ` ${this.appRoot.localize('digitalocean-unreachable')}`;
this.appRoot
.showModalDialog(
null, // Don't display any title.
- errorMessage, ['Delete this server', 'Try again'])
+ errorMessage,
+ [this.appRoot.localize('server-destroy'), this.appRoot.localize('retry')])
.then((clickedButtonIndex: number) => {
if (clickedButtonIndex === 0) { // user clicked 'Delete this server'
console.info('Deleting unreachable server');
@@ -722,12 +707,23 @@ export class App {
});
}
+ private getLocalizedCityName(regionId: server.RegionId) {
+ const cityId = digitalocean_server.GetCityId(regionId);
+ return this.appRoot.localize(`city-${cityId}`);
+ }
+
+ private makeLocalizedServerName(regionId: server.RegionId) {
+ const serverLocation = this.getLocalizedCityName(regionId);
+ return this.appRoot.localize('server-name', 'serverLocation', serverLocation);
+ }
+
// Returns a promise which fulfills once the DigitalOcean droplet is created.
// Shadowbox may not be fully installed once this promise is fulfilled.
public createDigitalOceanServer(regionId: server.RegionId) {
+ const serverName = this.makeLocalizedServerName(regionId);
return this
.digitalOceanRetry(() => {
- return this.digitalOceanRepository.createServer(regionId);
+ return this.digitalOceanRepository.createServer(regionId, serverName);
})
.then((server) => {
this.syncServerCreationToUi(server);
@@ -761,6 +757,7 @@ export class App {
view.serverHostname = selectedServer.getHostname();
view.serverManagementApiUrl = selectedServer.getManagementApiUrl();
view.serverPortForNewAccessKeys = selectedServer.getPortForNewAccessKeys();
+ // TODO(alalama): use actual locale.
view.serverCreationDate = selectedServer.getCreatedDate().toLocaleString(
'en-US', {year: 'numeric', month: 'long', day: 'numeric'});
@@ -770,7 +767,7 @@ export class App {
view.monthlyCost = host.getMonthlyCost().usd;
view.monthlyOutboundTransferBytes =
host.getMonthlyOutboundTransferLimit().terabytes * (2 ** 40);
- view.serverLocation = digitalocean_server.GetEnglishCityName(host.getRegionId());
+ view.serverLocation = this.getLocalizedCityName(host.getRegionId());
} else {
view.isServerManaged = false;
}
@@ -783,14 +780,15 @@ export class App {
// Load "My Connection" and other access keys.
selectedServer.listAccessKeys()
.then((serverAccessKeys: server.AccessKey[]) => {
- view.accessKeyRows = serverAccessKeys.map(convertToUiAccessKey);
+ view.accessKeyRows = serverAccessKeys.map(this.convertToUiAccessKey.bind(this));
// Initialize help bubbles once the page has rendered.
setTimeout(() => {
view.initHelpBubbles();
}, 250);
})
.catch((error) => {
- this.displayError('Could not load keys', error);
+ console.error(`Failed to load access keys: ${error}`);
+ this.appRoot.showError(this.appRoot.localize('error-keys-get'));
});
this.showTransferStats(selectedServer, view);
@@ -870,20 +868,36 @@ export class App {
}
private getS3InviteUrl(accessUrl: string, isAdmin = false) {
+ // TODO(alalama): display the invite in the user's preferred language.
const adminParam = isAdmin ? '?admin_embed' : '';
return `https://s3.amazonaws.com/outline-vpn/invite.html${adminParam}#${
encodeURIComponent(accessUrl)}`;
}
+ // Converts the access key from the remote service format to the
+ // format used by outline-server-view.
+ private convertToUiAccessKey(remoteAccessKey: server.AccessKey): UiAccessKey {
+ return {
+ id: remoteAccessKey.id,
+ placeholderName: `${this.appRoot.localize('key')} ${remoteAccessKey.id}`,
+ name: remoteAccessKey.name,
+ accessUrl: remoteAccessKey.accessUrl,
+ transferredBytes: 0,
+ relativeTraffic: 0
+ };
+ }
+
+
private addAccessKey() {
this.selectedServer.addAccessKey()
.then((serverAccessKey: server.AccessKey) => {
- const uiAccessKey = convertToUiAccessKey(serverAccessKey);
+ const uiAccessKey = this.convertToUiAccessKey(serverAccessKey);
this.appRoot.getServerView(this.appRoot.selectedServer.id).addAccessKey(uiAccessKey);
- this.displayNotification('Key added');
+ this.appRoot.showNotification(this.appRoot.localize('notification-key-added'));
})
.catch((error) => {
- this.displayError('Failed to add key', error);
+ console.error(`Failed to add access key: ${error}`);
+ this.appRoot.showError(this.appRoot.localize('error-key-add'));
});
}
@@ -893,7 +907,8 @@ export class App {
entry.commitName();
})
.catch((error) => {
- this.displayError('Failed to rename key', error);
+ console.error(`Failed to rename access key: ${error}`);
+ this.appRoot.showError(this.appRoot.localize('error-key-rename'));
entry.revertName();
});
}
@@ -906,7 +921,9 @@ export class App {
serverConfig = parseManualServerConfig(userInput);
} catch (e) {
// This shouldn't happen because the UI validates the URL before enabling the DONE button.
- return Promise.reject(new Error(`could not parse server config: ${e.message}`));
+ const msg = `could not parse server config: ${e.message}`;
+ console.error(msg);
+ return Promise.reject(new Error(msg));
}
// Don't let `ManualServerRepository.addServer` throw to avoid redundant error handling if we
@@ -914,7 +931,7 @@ export class App {
const storedServer = this.manualServerRepository.findServer(serverConfig);
if (!!storedServer) {
return this.syncServerToDisplay(storedServer).then((displayServer) => {
- this.appRoot.showToast('Server already added', 5000);
+ this.appRoot.showNotification(this.appRoot.localize('notification-server-exists'), 5000);
this.showServerIfHealthy(storedServer, displayServer);
});
}
@@ -926,8 +943,7 @@ export class App {
// Remove inaccessible manual server from local storage if it was just created.
manualServer.forget();
console.error('Manual server installed but unreachable.');
- return Promise.reject(new errors.UnreachableServerError(
- 'Your Outline Server was installed correctly, but we are not able to connect to it. Most likely this is because your server\'s firewall rules are blocking incoming connections. Please review them and make sure to allow incoming TCP connections on ports ranging from 1024 to 65535.'));
+ return Promise.reject(new errors.UnreachableServerError());
}
});
});
@@ -937,10 +953,11 @@ export class App {
this.selectedServer.removeAccessKey(accessKeyId)
.then(() => {
this.appRoot.getServerView(this.appRoot.selectedServer.id).removeAccessKey(accessKeyId);
- this.displayNotification('Key removed');
+ this.appRoot.showNotification(this.appRoot.localize('notification-key-removed'));
})
.catch((error) => {
- this.displayError('Failed to remove key', error);
+ console.error(`Failed to remove access key: ${error}`);
+ this.appRoot.showError(this.appRoot.localize('error-key-remove'));
});
}
@@ -952,9 +969,9 @@ export class App {
throw new Error(msg);
}
- const confirmationTitle = 'Destroy Server?';
- const confirmationText = 'Existing users will lose access. This action cannot be undone.';
- const confirmationButton = 'DESTROY';
+ const confirmationTitle = this.appRoot.localize('confirmation-server-destroy-title');
+ const confirmationText = this.appRoot.localize('confirmation-server-destroy');
+ const confirmationButton = this.appRoot.localize('destroy');
this.appRoot.getConfirmation(confirmationTitle, confirmationText, confirmationButton, () => {
this.digitalOceanRetry(() => {
return serverToDelete.getHost().delete();
@@ -965,12 +982,14 @@ export class App {
this.appRoot.selectedServer = null;
this.selectedServer = null;
this.showIntro();
- this.displayNotification('Server destroyed');
+ this.appRoot.showNotification(
+ this.appRoot.localize('notification-server-destroyed'));
},
(e) => {
// Don't show a toast on the login screen.
if (!(e instanceof digitalocean_api.XhrError)) {
- this.displayError('Failed to destroy server', e);
+ console.error(`Failed destroy server: ${e}`);
+ this.appRoot.showError(this.appRoot.localize('error-server-destroy'));
}
});
});
@@ -984,17 +1003,16 @@ export class App {
throw new Error(msg);
}
- const confirmationTitle = 'Remove Server?';
- const confirmationText =
- 'This action removes your server from the Outline Manager, but does not block proxy access to users. You will still need to manually delete the Outline server from your host machine.';
- const confirmationButton = 'REMOVE';
+ const confirmationTitle = this.appRoot.localize('confirmation-server-remove-title');
+ const confirmationText = this.appRoot.localize('confirmation-server-remove');
+ const confirmationButton = this.appRoot.localize('remove');
this.appRoot.getConfirmation(confirmationTitle, confirmationText, confirmationButton, () => {
serverToForget.forget();
this.removeServerFromDisplay(this.appRoot.selectedServer);
this.appRoot.selectedServer = null;
this.selectedServer = null;
this.showIntro();
- this.displayNotification('Server removed');
+ this.appRoot.showNotification(this.appRoot.localize('notification-server-removed'));
});
}
@@ -1006,7 +1024,8 @@ export class App {
metricsEnabled;
})
.catch((error) => {
- this.displayError('Error setting metrics enabled', error);
+ console.error(`Failed to set metrics enabled: ${error}`);
+ this.appRoot.showError(this.appRoot.localize('error-metrics'));
});
}
@@ -1017,7 +1036,8 @@ export class App {
return this.syncAndShowServer(this.selectedServer);
})
.catch((error) => {
- this.displayError('Error renaming server', error);
+ console.error(`Failed to rename server: ${error}`);
+ this.appRoot.showError(this.appRoot.localize('error-server-rename'));
});
}
diff --git a/src/server_manager/web_app/build_action.sh b/src/server_manager/web_app/build_action.sh
index ee81939d..90b14434 100755
--- a/src/server_manager/web_app/build_action.sh
+++ b/src/server_manager/web_app/build_action.sh
@@ -55,4 +55,4 @@ mkdir -p $STATIC_DIR
cp -r $OUT_DIR/browserified/* $STATIC_DIR/
# Copy static resources
-cp -r $ROOT_DIR/src/server_manager/{bower_components,ui_components,index.html,images} $STATIC_DIR
+cp -r $ROOT_DIR/src/server_manager/{bower_components,ui_components,index.html,images,messages} $STATIC_DIR
diff --git a/src/server_manager/web_app/digitalocean_server.ts b/src/server_manager/web_app/digitalocean_server.ts
index 0b1bb329..a1d9ca87 100644
--- a/src/server_manager/web_app/digitalocean_server.ts
+++ b/src/server_manager/web_app/digitalocean_server.ts
@@ -52,27 +52,6 @@ function makeKeyValueTag(key: string, value: string) {
return [KEY_VALUE_TAG, key, asciiToHex(value)].join(':');
}
-const cityEnglishNameById: {[key: string]: string} = {
- ams: 'Amsterdam',
- sgp: 'Singapore',
- blr: 'Bangalore',
- fra: 'Frankfurt',
- lon: 'London',
- sfo: 'San Francisco',
- tor: 'Toronto',
- nyc: 'New York'
-};
-
-// Returns a name for a server in the given region.
-export function MakeEnglishNameForServer(regionId: server.RegionId) {
- return `Outline Server ${cityEnglishNameById[getCityId(regionId)]}`;
-}
-
-// Returns the English name of the given region.
-export function GetEnglishCityName(regionId: server.RegionId) {
- return cityEnglishNameById[getCityId(regionId)];
-}
-
// Possible install states for DigitaloceanServer.
enum InstallState {
// Unknown state - server may still be installing.
@@ -354,7 +333,7 @@ function startsWithCaseInsensitive(text: string, prefix: string) {
return text.slice(0, prefix.length).toLowerCase() === prefix.toLowerCase();
}
-function getCityId(slug: server.RegionId): string {
+export function GetCityId(slug: server.RegionId): string {
return slug.substr(0, 3).toLowerCase();
}
@@ -372,7 +351,7 @@ export class DigitaloceanServerRepository implements server.ManagedServerReposit
return this.digitalOcean.getRegionInfo().then((regions) => {
const ret: server.RegionMap = {};
regions.forEach((region) => {
- const cityId = getCityId(region.slug);
+ const cityId = GetCityId(region.slug);
if (!(cityId in ret)) {
ret[cityId] = [];
}
@@ -385,8 +364,7 @@ export class DigitaloceanServerRepository implements server.ManagedServerReposit
}
// Creates a server and returning it when it becomes active.
- createServer(region: server.RegionId): Promise {
- const name = MakeEnglishNameForServer(region);
+ createServer(region: server.RegionId, name: string): Promise {
console.time('activeServer');
console.time('servingServer');
const onceKeyPair = crypto.generateKeyPair();
- DigitalOcean servers
+ [[localize('servers-digitalocean')]]
@@ -326,7 +327,7 @@
- 
{{adminEmail}}
-
+
Disconnect DigitalOcean account
+[[localize('digitalocean-disconnect-account')]]
{{adminEmail}}
- Servers
+ [[localize('servers-manual')]]
@@ -342,20 +343,20 @@
-
- Data collection
- Feedback
- Help
- About
+ [[localize('nav-data-collection')]]
+ [[localize('nav-feedback')]]
+ [[localize('nav-help')]]
+ [[localize('nav-about')]]
@@ -363,14 +364,14 @@
-
@@ -415,27 +416,27 @@
@@ -445,7 +446,19 @@
const TOS_ACK_LOCAL_STORAGE_KEY = 'tos-ack';
Polymer({
is: 'app-root',
+ behaviors: [
+ Polymer.AppLocalizeBehavior
+ ],
properties: {
+ useKeyIfMissing: {
+ type: Boolean,
+ value: true
+ },
+ language: {
+ type: String,
+ readonly: true,
+ value: 'en'
+ },
serverList: {
type: Array,
value: [],
@@ -497,6 +510,11 @@
'SetUpGcpRequested': 'handleSetUpGcpRequested',
'ManualServerEntryCancelled': 'handleManualCancelled'
},
+ ready: function() {
+ // TODO(alalama): detect language
+ const messagesUrl = `/messages/${this.language}.json`;
+ this.loadResources(messagesUrl, this.language);
+ },
showIntro: function () {
this.maybeCloseDrawer();
this.selectedServer = undefined;
@@ -566,9 +584,8 @@
showError: function (errorMsg) {
this.showToast(errorMsg, Infinity);
},
- showNotification: function (message) {
- const NOTIFICATION_TOAST_DURATION_MS = 3000;
- this.showToast(message, NOTIFICATION_TOAST_DURATION_MS);
+ showNotification: function (message, durationMs=3000) {
+ this.showToast(message, durationMs);
},
showToast: function(message, duration) {
const toast = this.$.toast;
@@ -589,15 +606,15 @@
// cb is a function which accepts a single boolean which is true iff
// the user chose to retry the failing operation.
showConnectivityDialog: function (cb) {
- const dialogTitle = 'Connection problem';
- const dialogText = 'We\'re having trouble connecting to your DigitalOcean account. This is sometimes a temporary problem with DigitalOcean or with your internet connection. If retrying doesn\`t work, logging into DigitalOcean again should fix the problem.';
- this.showModalDialog(dialogTitle, dialogText, ['cancel', 'retry'])
+ const dialogTitle = this.localize('error-connectivity-title');
+ const dialogText = this.localize('error-connectivity');
+ this.showModalDialog(dialogTitle, dialogText, [this.localize('cancel'), this.localize('retry')])
.then((clickedButtonIndex) => {
cb(clickedButtonIndex === 1); // pass true if user clicked retry
});
},
getConfirmation: function(title, text, confirmButtonText, continueFunc) {
- this.showModalDialog(title, text, ['Cancel', confirmButtonText])
+ this.showModalDialog(title, text, [this.localize('cancel'), confirmButtonText])
.then((clickedButtonIndex) => {
if (clickedButtonIndex === 1) { // user clicked to confirm.
continueFunc();
@@ -605,7 +622,7 @@
});
},
showManualServerError: function (errorTitle, errorText) {
- this.showModalDialog(errorTitle, errorText, ['cancel', 'retry'])
+ this.showModalDialog(errorTitle, errorText, [this.localize('cancel'), this.localize('retry')])
.then((clickedButtonIndex) => {
if (clickedButtonIndex == 1) {
this.$.manualEntry.retryTapped();
diff --git a/src/server_manager/ui_components/cities.html b/src/server_manager/ui_components/cities.html
deleted file mode 100644
index 4d696e76..00000000
--- a/src/server_manager/ui_components/cities.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/server_manager/ui_components/outline-about-dialog.html b/src/server_manager/ui_components/outline-about-dialog.html
index e5a9626c..17cbe562 100644
--- a/src/server_manager/ui_components/outline-about-dialog.html
+++ b/src/server_manager/ui_components/outline-about-dialog.html
@@ -62,16 +62,15 @@
-
- Sign in or create an account with DigitalOcean.
- With your account, Outline makes it easy to create a server and get connected.
+ [[localize('oauth-connect-title')]]
+ [[localize('oauth-connect-description')]]
-
- Cancel
+ [[localize('cancel')]]
- Activate you DigitalOcean account.
- Check your inbox for an email from DigitalOcean, and click the link in it to confirm your account.
+ [[localize('oauth-activate-account')]]
+ [[localize('oauth-verify')]]
-
- Sign Out
+ [[localize('oauth-sign-out')]]
- Activate you DigitalOcean account.
- Enter your billing information on digitalocean.com and return to the app once you are done.
+ [[localize('oauth-activate-account')]]
+ [[localize('oauth-billing')]]
-
- Sign Out
+ [[localize('oauth-sign-out')]]
- Activate you DigitalOcean account.
- Your DigitalOcean account has been activated.
+ [[localize('oauth-activate-account')]]
+ [[localize('oauth-account-active')]]
-
- Sign Out
+ [[localize('oauth-sign-out')]]
@@ -132,6 +132,10 @@
type: String,
value: 'Cancel'
},
+ localize: {
+ type: Function,
+ readonly: true
+ },
onCancel: Function
},
_cancelTapped: function() {
diff --git a/src/server_manager/ui_components/outline-feedback-dialog.html b/src/server_manager/ui_components/outline-feedback-dialog.html
index f688dc6a..c1a6417d 100644
--- a/src/server_manager/ui_components/outline-feedback-dialog.html
+++ b/src/server_manager/ui_components/outline-feedback-dialog.html
@@ -88,34 +88,31 @@ see https://github.com/PolymerElements/paper-swatch-picker/issues/36 -->
- General feedback
- Having trouble installing Outline
- Can't connect to my server
- Others can't connect to my server
- Having trouble managing my server
- Suggestions
+ [[localize('feedback-general')]]
+ [[localize('feedback-install')]]
+ [[localize('feedback-connection')]]
+ [[localize('feedback-connection-others')]]
+ [[localize('feedback-management')]]
+ [[localize('feedback-suggestion')]]
-
+
DigitalOcean
Amazon Web Services
Google Cloud Platform
- Other
+ [[localize('feedback-other')]]
-
@@ -149,19 +146,25 @@ see https://github.com/PolymerElements/paper-swatch-picker/issues/36 -->
type: Boolean,
computed: '_computeShouldShowLanguageDisclaimer(hasEnteredEmail)',
},
+ localize: {
+ type: Function,
+ readonly: true
+ },
},
- open: function(prepopulatedMessage, showInstallationFailed, feedbackCategory = 0) {
+ open: function(prepopulatedMessage, showInstallationFailed) {
// Clear all fields, in case feedback had already been entered.
if (showInstallationFailed) {
- this.title = 'Outline Server Installation Failed';
- this.feedbackExplanation = 'An error occurred while attempting to install Outline on your server. If you haven\'t been able to figure out a solution, please consider sending us feedback and telling us your email address (optional) so that we can get back to you.';
+ this.title = this.localize('feedback-title-install');
+ this.feedbackExplanation = this.localize('feedback-explanation-install');
this.$.dialog.classList.add('installationFailed');
this.$.feedbackCategoryListbox.selected = this.feedbackCategories.INSTALLATION;
} else {
- this.title = 'Send Feedback';
+ this.title = this.localize('feedback-title-generic');
this.feedbackExplanation = '';
this.$.dialog.classList.remove('installationFailed');
- this.$.feedbackCategoryListbox.selected = feedbackCategory;
+ // TODO(alalama): figure out why the localized category doesn't get displayed the first
+ // time opening the dialog.
+ this.$.feedbackCategoryListbox.selected = this.feedbackCategories.GENERAL;
}
this.$.userFeedback.invalid = false;
this.$.userFeedback.value = prepopulatedMessage || '';
diff --git a/src/server_manager/ui_components/outline-intro-step.html b/src/server_manager/ui_components/outline-intro-step.html
index 01a35932..e13705d3 100644
--- a/src/server_manager/ui_components/outline-intro-step.html
+++ b/src/server_manager/ui_components/outline-intro-step.html
@@ -89,6 +89,7 @@
font-weight: 500;
letter-spacing: .05em;
font-size: 10px;
+ text-transform: uppercase;
}
.card#digital-ocean .tag, .card#digital-ocean .email, .card p {
color: var(--medium-gray);
@@ -155,13 +156,13 @@
- Choose a cloud service, set up Outline.
- Don't have a server? Create an account with DigitalOcean.
+ [[localize('setup-title')]]
+ [[localize('setup-description')]]
@@ -254,6 +255,10 @@
properties: {
isSignedInToDigitalOcean: Boolean,
digitalOceanEmail: String,
+ localize: {
+ type: Function,
+ readonly: true,
+ },
},
connectToDigitalOceanTapped: function() {
this.fire('ConnectToDigitalOcean');
diff --git a/src/server_manager/ui_components/outline-manual-server-entry.html b/src/server_manager/ui_components/outline-manual-server-entry.html
index 058c8ef3..8b4c20f7 100644
--- a/src/server_manager/ui_components/outline-manual-server-entry.html
+++ b/src/server_manager/ui_components/outline-manual-server-entry.html
@@ -162,42 +162,43 @@
}
- Follow the instructions below
- These steps will help you install Outline on a [[cloudProviderName]] Linux server.
+ [[localize('manual-server-title')]]
+ [[localize('manual-server-description', 'cloudProvider', cloudProviderName)]]
@@ -302,7 +303,11 @@
enableDoneButton: {
type: Boolean,
value: false,
- }
+ },
+ localize: {
+ type: Function,
+ readonly: true,
+ },
},
doneTapped: function() {
this.showConnection = true;
diff --git a/src/server_manager/ui_components/outline-metrics-option-dialog.html b/src/server_manager/ui_components/outline-metrics-option-dialog.html
index da9a26e6..67b1e08a 100644
--- a/src/server_manager/ui_components/outline-metrics-option-dialog.html
+++ b/src/server_manager/ui_components/outline-metrics-option-dialog.html
@@ -22,24 +22,30 @@
-
diff --git a/src/server_manager/ui_components/outline-server-progress-step.html b/src/server_manager/ui_components/outline-server-progress-step.html
index 3a9b1c4f..ed2c8779 100644
--- a/src/server_manager/ui_components/outline-server-progress-step.html
+++ b/src/server_manager/ui_components/outline-server-progress-step.html
@@ -60,10 +60,10 @@
- Setting up Outline.
- This could take up to two minutes. You can destroy this server at anytime.
+ [[localize('setup-do-title')]]
+ [[localize('setup-do-description')]]
- Cancel
+ [[localize('cancel')]]
@@ -169,6 +169,7 @@
serverLocation: {type: String, value: null},
serverMonthlyCost: {type: String, value: null},
serverMonthlyTransferLimit: {type: String, value: null},
+ localize: {type: Function, readonly: true},
},
update: function(name, metricsEnabled) {
this.initialName = name;
diff --git a/src/server_manager/ui_components/outline-server-view.html b/src/server_manager/ui_components/outline-server-view.html
index 725cb435..15157166 100644
--- a/src/server_manager/ui_components/outline-server-view.html
+++ b/src/server_manager/ui_components/outline-server-view.html
@@ -341,10 +341,10 @@
-
-
@@ -354,21 +354,24 @@
- Connections
- Settings
+ [[localize('server-connections')]]
+ [[localize('server-settings')]]
-
@@ -381,7 +384,7 @@
-
-
@@ -407,12 +410,12 @@
-
- Privacy
- Terms
- Licenses
+ [[localize('nav-privacy')]]
+ [[localize('nav-terms')]]
+ [[localize('nav-licenses')]]
-
- Could not load license.txt.
+ [[localize('error-licenses')]]
Version [[outlineVersion]]
-Outline is an open source project created by Jigsaw to provide a safer way for news organizations and journalists to access the internet. Learn more about Outline on our website.
-Outline is powered by Shadowsocks and is still an early stage project. You can contribute to the code on GitHub, and follow us on Reddit and Medium to hear when we expand to more platforms and add new features.
+ +>
[[title]]
- Show me where
+ [[localize('manual-server-show-me')]]
- Waiting to connect your account...
+[[localize('oauth-connect-tag')]]
- Confirm your email...
+[[localize('oauth-verify-tag')]]
- Enter billing information...
+[[localize('oauth-billing-tag')]]
- Account activated! Loading server locations...
+[[localize('oauth-account-active-tag')]]
[[feedbackExplanation]]
Please note that our team is only able to answer feedback in English.
-
- Your feedback, email address (if provided) and additional information
- referred to in the privacy policy
- will be sent to the Outline team.
+
[[localize('feedback-disclaimer')]]
+
-
@@ -169,78 +170,78 @@
RECOMMENDED
+ [[localize('setup-recommended')]]
{{digitalOceanEmail}}
-
-
- Easiest setup process -
- Only $5 a month -
- 1 TB of data transfer -
- Cancel at anytime +
- [[localize('setup-do-easiest')]] +
- [[localize('setup-do-cost')]] +
- [[localize('setup-do-data')]] +
- [[localize('setup-do-cancel')]]
- Create a new server with your DigitalOcean account for an additional $5 USD/30 days for 1TB of data transfer. + [[localize('setup-do-create')]]
- 
ADVANCED
+ [[localize('setup-advanced')]]
Google Cloud Platform
-
-
- Step-by-step set-up guide -
- Firewall instructions -
- Simple install commands +
- [[localize('setup-step-by-step')]] +
- [[localize('setup-firewall-instructions')]] +
- [[localize('setup-simple-commands')]]
- 
ADVANCED
+ [[localize('setup-advanced')]]
Amazon Web Services
-
-
- Step-by-step set-up guide -
- EC2 firewall instructions -
- Simple install commands +
- [[localize('setup-step-by-step')]] +
- [[localize('setup-firewall-instructions')]] +
- [[localize('setup-simple-commands')]]
- 
- ADVANCED
+ [[localize('setup-advanced')]]
Set up Outline anywhere
+ [[localize('setup-anywhere')]]
-
-
- Tested on VULTR, Linode, and Liquid Web -
- Simple install commands +
- [[localize('setup-tested')]] +
- [[localize('setup-simple-commands')]]
+
1
-
- Instructions
+ [[localize('manual-server-instructions')]]
Configure your firewall
+ [[localize('manual-server-firewall')]]
- Instructions
+ [[localize('manual-server-instructions')]]
-
+
-
+
@@ -207,33 +208,33 @@
-
-
- Navigate to the VM instances screen
.
- - Click on the instance where you want to host Outline. -
- Click 'EDIT' at the top of the VM Instance details screen. -
- Type 'outline' in the 'Network tags' field. -
- Click 'SAVE'. + +
- [[localize('gcp-firewall-assign-1')]] +
- [[localize('gcp-firewall-assign-2')]] +
- [[localize('gcp-firewall-assign-3')]] +
- [[localize('gcp-firewall-assign-4')]]
1
-
- Instructions
+ [[localize('manual-server-instructions')]]
Configure your firewall
+ [[localize('manual-server-firewall')]]
- Instructions
+ [[localize('manual-server-instructions')]]
-
+
-
-
- Once you've created your EC2 instance, open the EC2 Management Console
.
- - Under 'Network & Security', select 'Security Groups'. -
- Click on 'Create Security Group'. -
- Type 'outline' in the 'Security group name' and 'Description' fields. -
- Click 'Add Rule'. -
- Select 'All traffic' under 'Type', and 'Anywhere' under 'Source'. + +
- [[localize('aws-group-create-1')]] +
- [[localize('aws-group-create-2')]] +
- [[localize('aws-group-create-3')]] +
- [[localize('aws-group-create-4')]] +
- [[localize('aws-group-create-5')]]
-
+
@@ -244,7 +245,7 @@
-
-
- Navigate to Instances
.
- - Click 'Actions' > 'Networking' > 'Change Security Groups' at the top of the 'Instances' screen. -
- Select the 'outline' Security Group, unselect other security groups. -
- Click 'Assign Security Groups'. + +
- [[localize('aws-group-assign-1')]] +
- [[localize('aws-group-assign-2')]] +
- [[localize('aws-group-assign-3')]]
1
2
-
Log into your server, and run this command.
+ [[localize('manual-server-install-run')]]
sudo bash -c "$(wget -qO- https://raw.githubusercontent.com/Jigsaw-Code/outline-server/master/src/server_manager/install_scripts/install_server.sh)"
@@ -255,15 +256,15 @@
2
3
-
Paste your installation output here.
+ [[localize('manual-server-install-paste')]]
Metrics sharing
-Share anonymized metrics to help improve the reliability and performance of Outline, for you and for those you share your server with. Learn more.
+[[localize('metrics-title')]]
+
-
Digital Ocean
-DigitalOcean
+
-
Server Information
-Set a new name for your server. Note that this will not be reflected on the devices of the users that you invited to connect to it.
-[[localize('settings-server-info')]]
+[[localize('settings-server-rename')]]
+
-
- Share anonymous metrics
+[[localize('settings-metrics-header')]]
Share anonymized metrics to help improve the reliability and performance of Outline, for you and for those you share your server with. Learn more.
+
- Server unreachable
-We're having issues connecting to this server. Try again or remove this server from the application.
-We're having issues connecting to this server. Try again or destroy this server and the virtual host.
+[[localize('server-unreachable')]]
++
[[localize('server-unreachable-description')]]
+ [[localize('server-unreachable-managed-description')]]
+ [[localize('server-unreachable-manual-description')]]
+
[[_getFormattedTransferredValue(totalInboundBytes, '0')]]
[[_getFormattedTransferredUnit(totalInboundBytes, 'B')]]
Data transferred / 30 days
+[[localize('server-data-transfer')]]
@@ -389,17 +392,17 @@
[[managedServerUtilzationPercentage]]
-of [[_formatBytesTransferred(monthlyOutboundTransferBytes)]]
+/[[_formatBytesTransferred(monthlyOutboundTransferBytes)]]
Data used / 30 days
+[[localize('server-data-used')]]
[[accessKeyRows.length]]
-Keys
+[[localize('server-keys')]]
Server access
+[[localize('server-access')]]
- Access keys
+ [[localize('server-access-keys')]]
-
-
@@ -481,7 +484,7 @@
@@ -497,23 +500,24 @@
server-monthly-cost="[[monthlyCost]]"
server-monthly-transfer-limit="[[_formatBytesTransferred(monthlyOutboundTransferBytes)]]"
is-server-managed="[[isServerManaged]]"
- server-location="[[serverLocation]]">
+ server-location="[[serverLocation]]"
+ localize="[[localize]]">
-
@@ -465,10 +468,10 @@
My access key
- Connect your devices
+ [[localize('server-my-access-key')]]
+ [[localize('server-connect-devices')]]
Add new key
+ [[localize('server-access-key-new')]]
- You are not connected yet!
-Click here to install the Outline client app, using your personal access key to your Outline server
-[[localize('server-help-connection-title')]]
+[[localize('server-help-connection-description')]]
+
- Create keys, share access
-Share access keys with friends, so they can connect to your Outline server. They can use the same access key on all their devices
-[[localize('server-help-access-key-title')]]
+[[localize('server-help-access-key-description')]]
+
-
Share access
-- Copy this invitation and send it from a communication tool you trust. Need help? -
+[[localize('share-title')]]
+
-
- You’re invited to connect to my Outline server. Use it to access the open internet, no matter where you are. Follow the instructions on your invitation link below to download the Outline App and get connected.
+[[localize('share-invite')]]
-----
-Having trouble accessing the invitation link?
+[[localize('share-invite-trouble')]]
- - Copy your access key: + [[localize('share-invite-copy-access-key')]] {{acessKey}}
- - Follow our invitation instructions on GitHub: + [[localize('share-invite-instructions')]] https://github.com/Jigsaw-Code/outline-client/blob/master/docs/invitation-instructions.md
Copied to clipboard
+ [[localize('share-invite-copied')]]