](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
+
+
+Head to the [translating doc](docs/translating.md)
+
+Adding Strings to the translations (Developer Guide)
+====================================================
+
+Head to the [translating dev doc](docs/translating-dev.md)
+
Triaging issues
===============
@@ -292,7 +313,7 @@ bug or feature:
* feature
bug severity:
-
+
* cosmetic - feature works functionally but UI/UX is broken
* critical - whole app doesn't work
* major - entire feature doesn't work
diff --git a/docs/translating-dev.md b/docs/translating-dev.md
new file mode 100644
index 0000000000..80d4b64a3a
--- /dev/null
+++ b/docs/translating-dev.md
@@ -0,0 +1,26 @@
+# How to translate riot-web (Dev Guide)
+
+## Requirements
+
+- A working [Development Setup](../../#setting-up-a-dev-environment)
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Adding new strings
+
+1. Check if the import ``import _t from 'counterpart-riot'`` is present. If not add it to the other import statements.
+2. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method)
+3. Add the String to the ``en_EN.json`` file in ``src/i18n`` or if you are working in matrix-react-sdk you can find the json file in ``src/i18n/strings``
+
+## Adding variables inside a string.
+
+1. Extend your ``_t()`` call. Instead of ``_t(STRING)`` use ``_t(STRING, {})``
+2. Decide how to name it. Please think about if the person who has to translate it can understand what it does.
+3. Add it to the array in ``_t`` for example ``_t(STRING, {variable: this.variable})``
+4. Add the variable inside the string. The syntax for variables is ``%(variable)s``. Please note the s at the end. The name of the variable has to match the previous used name.
+
+## Things to know/Style Guides
+
+- Do not use it inside ``getDefaultProps`` at the point where ``getDefaultProps`` is initialized the translations aren't loaded yet and it causes missing translations.
+- If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded.
+- If a string is presented in the UI with punctuation like a full stop, include this in the translation strings, since punctuation varies between languages too.
diff --git a/docs/translating.md b/docs/translating.md
new file mode 100644
index 0000000000..ca9920d323
--- /dev/null
+++ b/docs/translating.md
@@ -0,0 +1,64 @@
+# How to translate riot-web
+
+## Requirements
+
+- Web Browser
+- Be able to understand English
+- Be able to understand the language you want to translate riot-web into
+
+## Step 0: Join #riotweb-translations:matrix.org
+
+1. Come and join https://riot.im/develop/#/room/#riotweb-translations:matrix.org
+2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed. In general little-or-no coordination is needed though :)
+
+## Step 1: Preparing your Weblate Profile
+
+1. Head to https://translate.nordgedanken.de and register either via Github or email
+2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
+3. Log into weblate
+4. Head to https://translate.nordgedanken.de/accounts/profile/ and select the languages you know and maybe another language you know too.
+6. Head to https://translate.nordgedanken.de/accounts/profile/#subscriptions and select Riot Web as Project
+
+## How to check if your language already is being translated
+
+Go to https://translate.nordgedanken.de/projects/riot-web/ and visit the 2 sub-projects.
+If your language is listed go to Step 2a and if not go to Step 2b
+
+## Step 2a: Helping on existing languages.
+
+1. Head to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
+2. Click on the ``translate`` button on the right side of your language
+3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.
+
+Head to the explanations under Steb 2b
+
+## Step 2b: Adding a new language
+
+1. Go to one of the projects listed https://translate.nordgedanken.de/projects/riot-web/
+2. Click the ``Start new language`` button at the bottom
+3. Select a language
+4. Start translating like in 2a.3
+5. Repeat these steps for the other projects which are listed at the link of step 2b.1
+
+### What means the green button under the text field?
+
+The green button let you save our translations directly. Please only use it if you are 100% sure about that translation. If you do not know a translation please DO NOT click that button. Use the arrows above the translations field and click to the right.
+
+### What means the yellow button under the text field?
+
+The yellow button has to be used if you are unsure about the translation but you have a rough idea. It adds a new suggestion to the string which can than be reviewed by others.
+
+### What are "%(something)s"?
+
+These things are variables that are expanded when displayed by Riot. They can be room names, usernames or similar. If you find one, you can move to the right place for your language, but not delete it as the variable will be missing if you do.
+
+A special case is `%(urlStart)s` and `%(urlEnd)s` which are used to mark the beginning of a hyperlink (i.e. `` and ``. You must keep these markers surrounding the equivalent string in your language that needs to be hyperlinked.
+
+### "I want to come back to this string. How?"
+
+You can use inside the translation field "Review needed" checkbox. It will be shown as Strings that need to be reviewed.
+
+
+### Further reading
+
+The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html
diff --git a/electron_app/package.json b/electron_app/package.json
index 99651cc1c5..df9c3bd261 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "0.9.9",
+ "version": "0.9.10",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index c5bc65e1ea..80526f4ab8 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -6,68 +6,11 @@
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+ "welcomeUserId": "@riot-bot:matrix.org",
"enableLabs": true,
"roomDirectory": {
"servers": [
"matrix.org"
- ],
- "serverConfig": {
- "matrix.org": {
- "networks": [
- "_matrix",
- "gitter",
- "irc:freenode",
- "irc:mozilla",
- "irc:snoonet",
- "irc:oftc"
- ]
- }
- },
- "networks": {
- "gitter": {
- "protocol": "gitter",
- "portalRoomPattern": "#gitter_.*:matrix.org",
- "name": "Gitter",
- "icon": "https://gitter.im/favicon.ico",
- "example": "org/community",
- "nativePattern": "[^\\s]+/[^\\s]+$"
- },
- "irc:freenode": {
- "protocol": "irc",
- "domain": "chat.freenode.net",
- "portalRoomPattern": "#freenode_.*:matrix.org",
- "name": "Freenode",
- "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
- "example": "#channel",
- "nativePattern": "^#[^\\s]+$"
- },
- "irc:mozilla": {
- "protocol": "irc",
- "domain": "chat.freenode.net",
- "portalRoomPattern": "#mozilla_.*:matrix.org",
- "name": "Mozilla",
- "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
- "example": "#channel",
- "nativePattern": "^#[^\\s]+$"
- },
- "irc:snoonet": {
- "protocol": "irc",
- "domain": "ipv6-irc.snoonet.org",
- "portalRoomPattern": "#_snoonet_.*:matrix.org",
- "name": "Snoonet",
- "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
- "example": "#channel",
- "nativePattern": "^#[^\\s]+$"
- },
- "irc:oftc": {
- "protocol": "irc",
- "domain": "irc.oftc.net",
- "portalRoomPattern": "#_oftc_.*:matrix.org",
- "name": "OFTC",
- "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
- "example": "#channel",
- "nativePattern": "^#[^\\s]+$"
- }
- }
+ ]
}
}
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 32e305d8d9..ca8c3a1be6 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -1,5 +1,3 @@
-// @flow
-
/*
Copyright 2016 Aviral Dasgupta
Copyright 2016 OpenMarket Ltd
@@ -20,15 +18,14 @@ limitations under the License.
// Squirrel on windows starts the app with various flags
// as hooks to tell us when we've been installed/uninstalled
// etc.
-const check_squirrel_hooks = require('./squirrelhooks');
-if (check_squirrel_hooks()) return;
+const checkSquirrelHooks = require('./squirrelhooks');
+if (checkSquirrelHooks()) return;
const electron = require('electron');
-const url = require('url');
const tray = require('./tray');
-
-const VectorMenu = require('./vectormenu');
+const vectorMenu = require('./vectormenu');
+const webContentsHandler = require('./webcontents-handler');
const windowStateKeeper = require('electron-window-state');
@@ -42,12 +39,6 @@ try {
// Continue with the defaults (ie. an empty config)
}
-const PERMITTED_URL_SCHEMES = [
- 'http:',
- 'https:',
- 'mailto:',
-];
-
const UPDATE_POLL_INTERVAL_MS = 60 * 60 * 1000;
const INITIAL_UPDATE_DELAY_MS = 30 * 1000;
@@ -59,13 +50,13 @@ function safeOpenURL(target) {
// so put fairly stringent limits on what can be opened
// (for instance, open /bin/sh does indeed open a terminal
// with a shell, albeit with no arguments)
- const parsed_url = url.parse(target);
- if (PERMITTED_URL_SCHEMES.indexOf(parsed_url.protocol) > -1) {
+ const parsedUrl = url.parse(target);
+ if (PERMITTED_URL_SCHEMES.indexOf(parsedUrl.protocol) > -1) {
// explicitly use the URL re-assembled by the url library,
// so we know the url parser has understood all the parts
// of the input string
- const new_target = url.format(parsed_url);
- electron.shell.openExternal(new_target);
+ const newTarget = url.format(parsedUrl);
+ electron.shell.openExternal(newTarget);
}
}
@@ -79,14 +70,19 @@ function onWindowOrNavigate(ev, target) {
}
function onLinkContextMenu(ev, params) {
- const popup_menu = new electron.Menu();
- popup_menu.append(new electron.MenuItem({
+ const popupMenu = new electron.Menu();
+
+ popupMenu.append(new electron.MenuItem({
label: params.linkURL,
- click() {
- safeOpenURL(params.linkURL);
- },
+ click() { safeOpenURL(params.linkURL); },
}));
- popup_menu.popup();
+
+ popupMenu.append(new electron.MenuItem({
+ label: 'Copy Link Address',
+ click() { electron.clipboard.writeText(params.linkURL); },
+ }));
+
+ popupMenu.popup();
ev.preventDefault();
}
@@ -101,13 +97,13 @@ function pollForUpdates() {
try {
electron.autoUpdater.checkForUpdates();
} catch (e) {
- console.log("Couldn't check for update", e);
+ console.log('Couldn\'t check for update', e);
}
}
-function startAutoUpdate(update_base_url) {
- if (update_base_url.slice(-1) !== '/') {
- update_base_url = update_base_url + '/';
+function startAutoUpdate(updateBaseUrl) {
+ if (updateBaseUrl.slice(-1) !== '/') {
+ updateBaseUrl = updateBaseUrl + '/';
}
try {
// For reasons best known to Squirrel, the way it checks for updates
@@ -115,7 +111,7 @@ function startAutoUpdate(update_base_url) {
// hits a URL that either gives it a 200 with some json or
// 204 No Content. On windows it takes a base path and looks for
// files under that path.
- if (process.platform == 'darwin') {
+ if (process.platform === 'darwin') {
// include the current version in the URL we hit. Electron doesn't add
// it anywhere (apart from the User-Agent) so it's up to us. We could
// (and previously did) just use the User-Agent, but this doesn't
@@ -123,16 +119,15 @@ function startAutoUpdate(update_base_url) {
// and also acts as a convenient cache-buster to ensure that when the
// app updates it always gets a fresh value to avoid update-looping.
electron.autoUpdater.setFeedURL(
- update_base_url +
- 'macos/?localVersion=' + encodeURIComponent(electron.app.getVersion())
- );
- } else if (process.platform == 'win32') {
- electron.autoUpdater.setFeedURL(update_base_url + 'win32/' + process.arch + '/');
+ `${updateBaseUrl}macos/?localVersion=${encodeURIComponent(electron.app.getVersion())}`);
+
+ } else if (process.platform === 'win32') {
+ electron.autoUpdater.setFeedURL(`${updateBaseUrl}win32/${process.arch}/`);
} else {
// Squirrel / electron only supports auto-update on these two platforms.
// I'm not even going to try to guess which feed style they'd use if they
// implemented it on Linux, or if it would be different again.
- console.log("Auto update not supported on this platform");
+ console.log('Auto update not supported on this platform');
}
// We check for updates ourselves rather than using 'updater' because we need to
// do it in the main process (and we don't really need to check every 10 minutes:
@@ -145,7 +140,7 @@ function startAutoUpdate(update_base_url) {
setInterval(pollForUpdates, UPDATE_POLL_INTERVAL_MS);
} catch (err) {
// will fail if running in debug mode
- console.log("Couldn't enable update checking", err);
+ console.log('Couldn\'t enable update checking', err);
}
}
@@ -155,12 +150,49 @@ function startAutoUpdate(update_base_url) {
// no other way to catch this error).
// Assuming we generally run from the console when developing,
// this is far preferable.
-process.on('uncaughtException', function (error) {
- console.log("Unhandled exception", error);
+process.on('uncaughtException', function(error) {
+ console.log('Unhandled exception', error);
});
electron.ipcMain.on('install_update', installUpdate);
+let focusHandlerAttached = false;
+electron.ipcMain.on('setBadgeCount', function(ev, count) {
+ electron.app.setBadgeCount(count);
+ if (process.platform === 'win32' && mainWindow && !mainWindow.isFocused()) {
+ if (count > 0) {
+ if (!focusHandlerAttached) {
+ mainWindow.once('focus', () => {
+ mainWindow.flashFrame(false);
+ focusHandlerAttached = false;
+ });
+ focusHandlerAttached = true;
+ }
+ mainWindow.flashFrame(true);
+ } else {
+ mainWindow.flashFrame(false);
+ }
+ }
+});
+
+let powerSaveBlockerId;
+electron.ipcMain.on('app_onAction', function(ev, payload) {
+ switch (payload.action) {
+ case 'call_state':
+ if (powerSaveBlockerId && powerSaveBlockerId.isStarted(powerSaveBlockerId)) {
+ if (payload.state === 'ended') {
+ electron.powerSaveBlocker.stop(powerSaveBlockerId);
+ }
+ } else {
+ if (payload.state === 'connected') {
+ powerSaveBlockerId = electron.powerSaveBlocker.start('prevent-display-sleep');
+ }
+ }
+ break;
+ }
+});
+
+
electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirectory) => {
@@ -173,30 +205,28 @@ const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirector
});
if (shouldQuit) {
- console.log("Other instance detected: exiting");
- electron.app.quit()
+ console.log('Other instance detected: exiting');
+ electron.app.quit();
}
electron.app.on('ready', () => {
if (vectorConfig.update_base_url) {
- console.log("Starting auto update with base URL: " + vectorConfig.update_base_url);
+ console.log(`Starting auto update with base URL: ${vectorConfig.update_base_url}`);
startAutoUpdate(vectorConfig.update_base_url);
} else {
- console.log("No update_base_url is defined: auto update is disabled");
+ console.log('No update_base_url is defined: auto update is disabled');
}
- const icon_path = `${__dirname}/../img/riot.` + (
- process.platform == 'win32' ? 'ico' : 'png'
- );
+ const iconPath = `${__dirname}/../img/riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
// Load the previous window state with fallback to defaults
- let mainWindowState = windowStateKeeper({
+ const mainWindowState = windowStateKeeper({
defaultWidth: 1024,
defaultHeight: 768,
});
mainWindow = new electron.BrowserWindow({
- icon: icon_path,
+ icon: iconPath,
show: false,
autoHideMenuBar: true,
@@ -206,12 +236,12 @@ electron.app.on('ready', () => {
height: mainWindowState.height,
});
mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
- electron.Menu.setApplicationMenu(VectorMenu);
+ electron.Menu.setApplicationMenu(vectorMenu);
// Create trayIcon icon
tray.create(mainWindow, {
- icon_path: icon_path,
- brand: vectorConfig.brand || 'Riot'
+ icon_path: iconPath,
+ brand: vectorConfig.brand || 'Riot',
});
if (!process.argv.includes('--hidden')) {
@@ -224,7 +254,7 @@ electron.app.on('ready', () => {
mainWindow = null;
});
mainWindow.on('close', (e) => {
- if (!appQuitting && (tray.hasTray() || process.platform == 'darwin')) {
+ if (!appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
// On Mac, closing the window just hides it
// (this is generally how single-window Mac apps
// behave, eg. Mail.app)
@@ -234,15 +264,7 @@ electron.app.on('ready', () => {
}
});
- mainWindow.webContents.on('new-window', onWindowOrNavigate);
- mainWindow.webContents.on('will-navigate', onWindowOrNavigate);
-
- mainWindow.webContents.on('context-menu', function(ev, params) {
- if (params.linkURL) {
- onLinkContextMenu(ev, params);
- }
- });
-
+ webContentsHandler(mainWindow.webContents);
mainWindowState.manage(mainWindow);
});
diff --git a/electron_app/src/squirrelhooks.js b/electron_app/src/squirrelhooks.js
index 15ed670f0c..728c9cfb2c 100644
--- a/electron_app/src/squirrelhooks.js
+++ b/electron_app/src/squirrelhooks.js
@@ -16,30 +16,30 @@ limitations under the License.
const path = require('path');
const spawn = require('child_process').spawn;
-const app = require('electron').app;
+const {app} = require('electron');
-function run_update_exe(args, done) {
+function runUpdateExe(args, done) {
// Invokes Squirrel's Update.exe which will do things for us like create shortcuts
// Note that there's an Update.exe in the app-x.x.x directory and one in the parent
// directory: we need to run the one in the parent directory, because it discovers
// information about the app by inspecting the directory it's run from.
const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');
- console.log('Spawning `%s` with args `%s`', updateExe, args);
+ console.log(`Spawning '${updateExe}' with args '${args}'`);
spawn(updateExe, args, {
- detached: true
+ detached: true,
}).on('close', done);
-};
+}
-function check_squirrel_hooks() {
- if (process.platform != 'win32') return false;
+function checkSquirrelHooks() {
+ if (process.platform !== 'win32') return false;
const cmd = process.argv[1];
const target = path.basename(process.execPath);
if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
- run_update_exe(['--createShortcut=' + target + ''], app.quit);
+ runUpdateExe(['--createShortcut=' + target + ''], app.quit);
return true;
} else if (cmd === '--squirrel-uninstall') {
- run_update_exe(['--removeShortcut=' + target + ''], app.quit);
+ runUpdateExe(['--removeShortcut=' + target + ''], app.quit);
return true;
} else if (cmd === '--squirrel-obsolete') {
app.quit();
@@ -48,4 +48,4 @@ function check_squirrel_hooks() {
return false;
}
-module.exports = check_squirrel_hooks;
+module.exports = checkSquirrelHooks;
diff --git a/electron_app/src/tray.js b/electron_app/src/tray.js
index 2ccdf40ccc..9df1a0fb60 100644
--- a/electron_app/src/tray.js
+++ b/electron_app/src/tray.js
@@ -15,26 +15,19 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-const path = require('path');
-const electron = require('electron');
-
-const app = electron.app;
-const Tray = electron.Tray;
-const MenuItem = electron.MenuItem;
+const {app, Tray, Menu, nativeImage} = require('electron');
let trayIcon = null;
exports.hasTray = function hasTray() {
return (trayIcon !== null);
-}
+};
-exports.create = function (win, config) {
+exports.create = function(win, config) {
// no trays on darwin
- if (process.platform === 'darwin' || trayIcon) {
- return;
- }
+ if (process.platform === 'darwin' || trayIcon) return;
- const toggleWin = function () {
+ const toggleWin = function() {
if (win.isVisible() && !win.isMinimized()) {
win.hide();
} else {
@@ -44,24 +37,46 @@ exports.create = function (win, config) {
}
};
- const contextMenu = electron.Menu.buildFromTemplate([
+ const contextMenu = Menu.buildFromTemplate([
{
- label: 'Show/Hide ' + config.brand,
- click: toggleWin
- },
- {
- type: 'separator'
+ label: `Show/Hide ${config.brand}`,
+ click: toggleWin,
},
+ { type: 'separator' },
{
label: 'Quit',
- click: function () {
+ click: function() {
app.quit();
- }
- }
+ },
+ },
]);
trayIcon = new Tray(config.icon_path);
trayIcon.setToolTip(config.brand);
trayIcon.setContextMenu(contextMenu);
trayIcon.on('click', toggleWin);
+
+ let lastFavicon = null;
+ win.webContents.on('page-favicon-updated', function(ev, favicons) {
+ let newFavicon = config.icon_path;
+ if (favicons && favicons.length > 0 && favicons[0].startsWith('data:')) {
+ newFavicon = favicons[0];
+ }
+
+ // No need to change, shortcut
+ if (newFavicon === lastFavicon) return;
+ lastFavicon = newFavicon;
+
+ // if its not default we have to construct into nativeImage
+ if (newFavicon !== config.icon_path) {
+ newFavicon = nativeImage.createFromDataURL(favicons[0]);
+ }
+
+ trayIcon.setImage(newFavicon);
+ win.setIcon(newFavicon);
+ });
+
+ win.webContents.on('page-title-updated', function(ev, title) {
+ trayIcon.setToolTip(title);
+ });
};
diff --git a/electron_app/src/vectormenu.js b/electron_app/src/vectormenu.js
index 70ed3ac33c..ab30b376b3 100644
--- a/electron_app/src/vectormenu.js
+++ b/electron_app/src/vectormenu.js
@@ -14,170 +14,112 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-const electron = require('electron');
+const {app, shell, Menu} = require('electron');
// Menu template from http://electron.atom.io/docs/api/menu/, edited
const template = [
{
label: 'Edit',
submenu: [
- {
- role: 'undo'
- },
- {
- role: 'redo'
- },
- {
- type: 'separator'
- },
- {
- role: 'cut'
- },
- {
- role: 'copy'
- },
- {
- role: 'paste'
- },
- {
- role: 'pasteandmatchstyle'
- },
- {
- role: 'delete'
- },
- {
- role: 'selectall'
- }
- ]
+ { role: 'undo' },
+ { role: 'redo' },
+ { type: 'separator' },
+ { role: 'cut' },
+ { role: 'copy' },
+ { role: 'paste' },
+ { role: 'pasteandmatchstyle' },
+ { role: 'delete' },
+ { role: 'selectall' },
+ ],
},
{
label: 'View',
submenu: [
- {
- type: 'separator'
- },
- {
- role: 'resetzoom'
- },
- {
- role: 'zoomin'
- },
- {
- role: 'zoomout'
- },
- {
- type: 'separator'
- },
- {
- role: 'togglefullscreen'
- },
- {
- role: 'toggledevtools'
- }
- ]
+ { type: 'separator' },
+ { role: 'resetzoom' },
+ { role: 'zoomin' },
+ { role: 'zoomout' },
+ { type: 'separator' },
+ { role: 'togglefullscreen' },
+ { role: 'toggledevtools' },
+ ],
},
{
role: 'window',
submenu: [
- {
- role: 'minimize'
- },
- {
- role: 'close'
- }
- ]
+ { role: 'minimize' },
+ { role: 'close' },
+ ],
},
{
role: 'help',
submenu: [
{
label: 'riot.im',
- click () { electron.shell.openExternal('https://riot.im/') }
- }
- ]
- }
+ click() { shell.openExternal('https://riot.im/'); },
+ },
+ ],
+ },
];
// macOS has specific menu conventions...
if (process.platform === 'darwin') {
// first macOS menu is the name of the app
- const name = electron.app.getName()
+ const name = app.getName();
template.unshift({
label: name,
submenu: [
- {
- role: 'about'
- },
- {
- type: 'separator'
- },
+ { role: 'about' },
+ { type: 'separator' },
{
role: 'services',
- submenu: []
+ submenu: [],
},
- {
- type: 'separator'
- },
- {
- role: 'hide'
- },
- {
- role: 'hideothers'
- },
- {
- role: 'unhide'
- },
- {
- type: 'separator'
- },
- {
- role: 'quit'
- }
- ]
- })
+ { type: 'separator' },
+ { role: 'hide' },
+ { role: 'hideothers' },
+ { role: 'unhide' },
+ { type: 'separator' },
+ { role: 'quit' },
+ ],
+ });
// Edit menu.
// This has a 'speech' section on macOS
template[1].submenu.push(
- {
- type: 'separator'
- },
+ { type: 'separator' },
{
label: 'Speech',
submenu: [
- {
- role: 'startspeaking'
- },
- {
- role: 'stopspeaking'
- }
- ]
- }
- )
+ { role: 'startspeaking' },
+ { role: 'stopspeaking' },
+ ],
+ });
+
// Window menu.
// This also has specific functionality on macOS
template[3].submenu = [
{
label: 'Close',
accelerator: 'CmdOrCtrl+W',
- role: 'close'
+ role: 'close',
},
{
label: 'Minimize',
accelerator: 'CmdOrCtrl+M',
- role: 'minimize'
+ role: 'minimize',
},
{
label: 'Zoom',
- role: 'zoom'
+ role: 'zoom',
},
{
- type: 'separator'
+ type: 'separator',
},
{
label: 'Bring All to Front',
- role: 'front'
- }
- ]
+ role: 'front',
+ },
+ ];
} else {
template.unshift({
label: 'File',
@@ -186,12 +128,10 @@ if (process.platform === 'darwin') {
/*{
role: 'about'
},*/
- {
- role: 'quit'
- }
- ]
+ { role: 'quit' },
+ ],
});
}
-module.exports = electron.Menu.buildFromTemplate(template)
+module.exports = Menu.buildFromTemplate(template);
diff --git a/electron_app/src/webcontents-handler.js b/electron_app/src/webcontents-handler.js
new file mode 100644
index 0000000000..37416ebe96
--- /dev/null
+++ b/electron_app/src/webcontents-handler.js
@@ -0,0 +1,122 @@
+const {clipboard, nativeImage, Menu, MenuItem, shell} = require('electron');
+const url = require('url');
+
+const PERMITTED_URL_SCHEMES = [
+ 'http:',
+ 'https:',
+ 'mailto:',
+];
+
+function safeOpenURL(target) {
+ // openExternal passes the target to open/start/xdg-open,
+ // so put fairly stringent limits on what can be opened
+ // (for instance, open /bin/sh does indeed open a terminal
+ // with a shell, albeit with no arguments)
+ const parsedUrl = url.parse(target);
+ if (PERMITTED_URL_SCHEMES.indexOf(parsedUrl.protocol) > -1) {
+ // explicitly use the URL re-assembled by the url library,
+ // so we know the url parser has understood all the parts
+ // of the input string
+ const newTarget = url.format(parsedUrl);
+ shell.openExternal(newTarget);
+ }
+}
+
+function onWindowOrNavigate(ev, target) {
+ // always prevent the default: if something goes wrong,
+ // we don't want to end up opening it in the electron
+ // app, as we could end up opening any sort of random
+ // url in a window that has node scripting access.
+ ev.preventDefault();
+ safeOpenURL(target);
+}
+
+function onLinkContextMenu(ev, params) {
+ const url = params.linkURL || params.srcURL;
+
+ const popupMenu = new Menu();
+ popupMenu.append(new MenuItem({
+ label: url,
+ click() {
+ safeOpenURL(url);
+ },
+ }));
+
+ if (params.mediaType && params.mediaType === 'image' && !url.startsWith('file://')) {
+ popupMenu.append(new MenuItem({
+ label: 'Copy Image',
+ click() {
+ if (url.startsWith('data:')) {
+ clipboard.writeImage(nativeImage.createFromDataURL(url));
+ } else {
+ ev.sender.copyImageAt(params.x, params.y);
+ }
+ },
+ }));
+ }
+
+ popupMenu.append(new MenuItem({
+ label: 'Copy Link Address',
+ click() {
+ clipboard.writeText(url);
+ },
+ }));
+ popupMenu.popup();
+ ev.preventDefault();
+}
+
+function _CutCopyPasteSelectContextMenus(params) {
+ return [{
+ role: 'cut',
+ enabled: params.editFlags.canCut,
+ }, {
+ role: 'copy',
+ enabled: params.editFlags.canCopy,
+ }, {
+ role: 'paste',
+ enabled: params.editFlags.canPaste,
+ }, {
+ role: 'pasteandmatchstyle',
+ enabled: params.editFlags.canPaste,
+ }, {
+ role: 'selectall',
+ enabled: params.editFlags.canSelectAll,
+ }];
+}
+
+function onSelectedContextMenu(ev, params) {
+ const items = _CutCopyPasteSelectContextMenus(params);
+ const popupMenu = Menu.buildFromTemplate(items);
+
+ popupMenu.popup();
+ ev.preventDefault();
+}
+
+function onEditableContextMenu(ev, params) {
+ const items = [
+ { role: 'undo' },
+ { role: 'redo', enabled: params.editFlags.canRedo },
+ { type: 'separator' },
+ ].concat(_CutCopyPasteSelectContextMenus(params));
+
+ const popupMenu = Menu.buildFromTemplate(items);
+
+ popupMenu.popup();
+ ev.preventDefault();
+}
+
+
+module.exports = (webContents) => {
+ webContents.on('new-window', onWindowOrNavigate);
+ webContents.on('will-navigate', onWindowOrNavigate);
+
+ webContents.on('context-menu', function(ev, params) {
+ if (params.linkURL || params.srcURL) {
+ onLinkContextMenu(ev, params);
+ } else if (params.selectionText) {
+ onSelectedContextMenu(ev, params);
+ } else if (params.isEditable) {
+ onEditableContextMenu(ev, params);
+ }
+ });
+};
diff --git a/karma.conf.js b/karma.conf.js
index b0a48c92ba..1e04366313 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -47,7 +47,6 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';
webpack_config.resolve.root = [
- path.resolve('./src'),
path.resolve('./test'),
];
diff --git a/package.json b/package.json
index a1f06b00b1..29b5beee07 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.9.9",
+ "version": "0.9.10",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {
@@ -61,6 +61,7 @@
"favico.js": "^0.3.10",
"filesize": "3.5.6",
"flux": "~2.0.3",
+ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
@@ -73,7 +74,7 @@
"react-dnd": "^2.1.4",
"react-dnd-html5-backend": "^2.1.2",
"react-dom": "^15.4.0",
- "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#39d858c",
+ "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.11.1",
"ua-parser-js": "^0.7.10",
"url": "^0.11.0"
@@ -103,6 +104,7 @@
"emojione": "^2.2.7",
"eslint": "^3.14.0",
"eslint-config-google": "^0.7.1",
+ "eslint-plugin-babel": "^4.1.1",
"eslint-plugin-flowtype": "^2.30.0",
"eslint-plugin-react": "^6.9.0",
"expect": "^1.16.0",
@@ -142,7 +144,7 @@
"build": {
"appId": "im.riot.app",
"category": "Network",
- "electronVersion": "1.6.2",
+ "electronVersion": "1.6.8",
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
"asar": false,
"dereference": true,
@@ -157,6 +159,7 @@
],
"linux": {
"target": "deb",
+ "category": "Network;InstantMessaging;Chat",
"maintainer": "support@riot.im",
"desktop": {
"StartupWMClass": "riot-web"
diff --git a/release.sh b/release.sh
index c245456051..8ae307f7e2 100755
--- a/release.sh
+++ b/release.sh
@@ -9,6 +9,22 @@ set -e
cd `dirname $0`
+for i in matrix-js-sdk matrix-react-sdk
+do
+ depver=`cat package.json | jq -r .dependencies.\"$i\"`
+ latestver=`npm show $i version`
+ if [ "$depver" != "$latestver" ]
+ then
+ echo "The latest version of $i is $latestver but package.json depends on $depver"
+ echo -n "Type 'Yes' to continue anyway: "
+ read resp
+ if [ "$resp" != "Yes" ]
+ then
+ echo "OK, never mind."
+ exit 1
+ fi
+ fi
+done
# bump Electron's package.json first
release="${1#v}"
diff --git a/res/flags/AD.png b/res/flags/AD.png
new file mode 100644
index 0000000000..8e777b9822
Binary files /dev/null and b/res/flags/AD.png differ
diff --git a/res/flags/AE.png b/res/flags/AE.png
new file mode 100644
index 0000000000..1c4a2bb790
Binary files /dev/null and b/res/flags/AE.png differ
diff --git a/res/flags/AF.png b/res/flags/AF.png
new file mode 100644
index 0000000000..7d369371f5
Binary files /dev/null and b/res/flags/AF.png differ
diff --git a/res/flags/AG.png b/res/flags/AG.png
new file mode 100644
index 0000000000..78c03626ba
Binary files /dev/null and b/res/flags/AG.png differ
diff --git a/res/flags/AI.png b/res/flags/AI.png
new file mode 100644
index 0000000000..8a70782310
Binary files /dev/null and b/res/flags/AI.png differ
diff --git a/res/flags/AL.png b/res/flags/AL.png
new file mode 100644
index 0000000000..b19c7bc52d
Binary files /dev/null and b/res/flags/AL.png differ
diff --git a/res/flags/AM.png b/res/flags/AM.png
new file mode 100644
index 0000000000..b39695fd49
Binary files /dev/null and b/res/flags/AM.png differ
diff --git a/res/flags/AO.png b/res/flags/AO.png
new file mode 100644
index 0000000000..5aee75af1b
Binary files /dev/null and b/res/flags/AO.png differ
diff --git a/res/flags/AQ.png b/res/flags/AQ.png
new file mode 100644
index 0000000000..fa76fbb278
Binary files /dev/null and b/res/flags/AQ.png differ
diff --git a/res/flags/AR.png b/res/flags/AR.png
new file mode 100644
index 0000000000..28750f42a8
Binary files /dev/null and b/res/flags/AR.png differ
diff --git a/res/flags/AS.png b/res/flags/AS.png
new file mode 100644
index 0000000000..36ba9b34df
Binary files /dev/null and b/res/flags/AS.png differ
diff --git a/res/flags/AT.png b/res/flags/AT.png
new file mode 100644
index 0000000000..487fee823c
Binary files /dev/null and b/res/flags/AT.png differ
diff --git a/res/flags/AU.png b/res/flags/AU.png
new file mode 100644
index 0000000000..7004861f7f
Binary files /dev/null and b/res/flags/AU.png differ
diff --git a/res/flags/AW.png b/res/flags/AW.png
new file mode 100644
index 0000000000..238084e4a8
Binary files /dev/null and b/res/flags/AW.png differ
diff --git a/res/flags/AX.png b/res/flags/AX.png
new file mode 100644
index 0000000000..07ac7742ab
Binary files /dev/null and b/res/flags/AX.png differ
diff --git a/res/flags/AZ.png b/res/flags/AZ.png
new file mode 100644
index 0000000000..686dbed76c
Binary files /dev/null and b/res/flags/AZ.png differ
diff --git a/res/flags/BA.png b/res/flags/BA.png
new file mode 100644
index 0000000000..5cfbb6d657
Binary files /dev/null and b/res/flags/BA.png differ
diff --git a/res/flags/BB.png b/res/flags/BB.png
new file mode 100644
index 0000000000..dcdbae7a9a
Binary files /dev/null and b/res/flags/BB.png differ
diff --git a/res/flags/BD.png b/res/flags/BD.png
new file mode 100644
index 0000000000..3bd977a442
Binary files /dev/null and b/res/flags/BD.png differ
diff --git a/res/flags/BE.png b/res/flags/BE.png
new file mode 100644
index 0000000000..555ac8bb74
Binary files /dev/null and b/res/flags/BE.png differ
diff --git a/res/flags/BF.png b/res/flags/BF.png
new file mode 100644
index 0000000000..5a80be2aaa
Binary files /dev/null and b/res/flags/BF.png differ
diff --git a/res/flags/BG.png b/res/flags/BG.png
new file mode 100644
index 0000000000..6d8be358f9
Binary files /dev/null and b/res/flags/BG.png differ
diff --git a/res/flags/BH.png b/res/flags/BH.png
new file mode 100644
index 0000000000..0d98e0e051
Binary files /dev/null and b/res/flags/BH.png differ
diff --git a/res/flags/BI.png b/res/flags/BI.png
new file mode 100644
index 0000000000..e2659e3bc1
Binary files /dev/null and b/res/flags/BI.png differ
diff --git a/res/flags/BJ.png b/res/flags/BJ.png
new file mode 100644
index 0000000000..13fa3c91e7
Binary files /dev/null and b/res/flags/BJ.png differ
diff --git a/res/flags/BL.png b/res/flags/BL.png
new file mode 100644
index 0000000000..8e50a79605
Binary files /dev/null and b/res/flags/BL.png differ
diff --git a/res/flags/BM.png b/res/flags/BM.png
new file mode 100644
index 0000000000..53de7c39b2
Binary files /dev/null and b/res/flags/BM.png differ
diff --git a/res/flags/BN.png b/res/flags/BN.png
new file mode 100644
index 0000000000..3ed976ebff
Binary files /dev/null and b/res/flags/BN.png differ
diff --git a/res/flags/BO.png b/res/flags/BO.png
new file mode 100644
index 0000000000..8e20ea8cee
Binary files /dev/null and b/res/flags/BO.png differ
diff --git a/res/flags/BQ.png b/res/flags/BQ.png
new file mode 100644
index 0000000000..1547226606
Binary files /dev/null and b/res/flags/BQ.png differ
diff --git a/res/flags/BR.png b/res/flags/BR.png
new file mode 100644
index 0000000000..7a2bc17adc
Binary files /dev/null and b/res/flags/BR.png differ
diff --git a/res/flags/BS.png b/res/flags/BS.png
new file mode 100644
index 0000000000..2a152575c6
Binary files /dev/null and b/res/flags/BS.png differ
diff --git a/res/flags/BT.png b/res/flags/BT.png
new file mode 100644
index 0000000000..4782cf34a6
Binary files /dev/null and b/res/flags/BT.png differ
diff --git a/res/flags/BV.png b/res/flags/BV.png
new file mode 100644
index 0000000000..991a6cd76c
Binary files /dev/null and b/res/flags/BV.png differ
diff --git a/res/flags/BW.png b/res/flags/BW.png
new file mode 100644
index 0000000000..cd78895521
Binary files /dev/null and b/res/flags/BW.png differ
diff --git a/res/flags/BY.png b/res/flags/BY.png
new file mode 100644
index 0000000000..40cdd8a7dd
Binary files /dev/null and b/res/flags/BY.png differ
diff --git a/res/flags/BZ.png b/res/flags/BZ.png
new file mode 100644
index 0000000000..5de79b7630
Binary files /dev/null and b/res/flags/BZ.png differ
diff --git a/res/flags/CA.png b/res/flags/CA.png
new file mode 100644
index 0000000000..68bcac9997
Binary files /dev/null and b/res/flags/CA.png differ
diff --git a/res/flags/CC.png b/res/flags/CC.png
new file mode 100644
index 0000000000..13fe2b7f4d
Binary files /dev/null and b/res/flags/CC.png differ
diff --git a/res/flags/CD.png b/res/flags/CD.png
new file mode 100644
index 0000000000..c19304093e
Binary files /dev/null and b/res/flags/CD.png differ
diff --git a/res/flags/CF.png b/res/flags/CF.png
new file mode 100644
index 0000000000..6df7750774
Binary files /dev/null and b/res/flags/CF.png differ
diff --git a/res/flags/CG.png b/res/flags/CG.png
new file mode 100644
index 0000000000..2d37cd50a8
Binary files /dev/null and b/res/flags/CG.png differ
diff --git a/res/flags/CH.png b/res/flags/CH.png
new file mode 100644
index 0000000000..00d3871728
Binary files /dev/null and b/res/flags/CH.png differ
diff --git a/res/flags/CI.png b/res/flags/CI.png
new file mode 100644
index 0000000000..82c7606ee9
Binary files /dev/null and b/res/flags/CI.png differ
diff --git a/res/flags/CK.png b/res/flags/CK.png
new file mode 100644
index 0000000000..26bca5f9c9
Binary files /dev/null and b/res/flags/CK.png differ
diff --git a/res/flags/CL.png b/res/flags/CL.png
new file mode 100644
index 0000000000..317ec573fc
Binary files /dev/null and b/res/flags/CL.png differ
diff --git a/res/flags/CM.png b/res/flags/CM.png
new file mode 100644
index 0000000000..c5605d6391
Binary files /dev/null and b/res/flags/CM.png differ
diff --git a/res/flags/CN.png b/res/flags/CN.png
new file mode 100644
index 0000000000..1c25ab8662
Binary files /dev/null and b/res/flags/CN.png differ
diff --git a/res/flags/CO.png b/res/flags/CO.png
new file mode 100644
index 0000000000..b328c1ea82
Binary files /dev/null and b/res/flags/CO.png differ
diff --git a/res/flags/CR.png b/res/flags/CR.png
new file mode 100644
index 0000000000..df959197fe
Binary files /dev/null and b/res/flags/CR.png differ
diff --git a/res/flags/CU.png b/res/flags/CU.png
new file mode 100644
index 0000000000..60f6a8c8f2
Binary files /dev/null and b/res/flags/CU.png differ
diff --git a/res/flags/CV.png b/res/flags/CV.png
new file mode 100644
index 0000000000..2dfe516d29
Binary files /dev/null and b/res/flags/CV.png differ
diff --git a/res/flags/CW.png b/res/flags/CW.png
new file mode 100644
index 0000000000..2380de1568
Binary files /dev/null and b/res/flags/CW.png differ
diff --git a/res/flags/CX.png b/res/flags/CX.png
new file mode 100644
index 0000000000..49a51c164b
Binary files /dev/null and b/res/flags/CX.png differ
diff --git a/res/flags/CY.png b/res/flags/CY.png
new file mode 100644
index 0000000000..08a0e372e2
Binary files /dev/null and b/res/flags/CY.png differ
diff --git a/res/flags/CZ.png b/res/flags/CZ.png
new file mode 100644
index 0000000000..90ceaa242a
Binary files /dev/null and b/res/flags/CZ.png differ
diff --git a/res/flags/DE.png b/res/flags/DE.png
new file mode 100644
index 0000000000..90cab7e9a4
Binary files /dev/null and b/res/flags/DE.png differ
diff --git a/res/flags/DJ.png b/res/flags/DJ.png
new file mode 100644
index 0000000000..c424a807a8
Binary files /dev/null and b/res/flags/DJ.png differ
diff --git a/res/flags/DK.png b/res/flags/DK.png
new file mode 100644
index 0000000000..5a3845ad10
Binary files /dev/null and b/res/flags/DK.png differ
diff --git a/res/flags/DM.png b/res/flags/DM.png
new file mode 100644
index 0000000000..e7fb60c04a
Binary files /dev/null and b/res/flags/DM.png differ
diff --git a/res/flags/DO.png b/res/flags/DO.png
new file mode 100644
index 0000000000..03c2f1b9d4
Binary files /dev/null and b/res/flags/DO.png differ
diff --git a/res/flags/DZ.png b/res/flags/DZ.png
new file mode 100644
index 0000000000..9d63939e7f
Binary files /dev/null and b/res/flags/DZ.png differ
diff --git a/res/flags/EC.png b/res/flags/EC.png
new file mode 100644
index 0000000000..92e2a9e929
Binary files /dev/null and b/res/flags/EC.png differ
diff --git a/res/flags/EE.png b/res/flags/EE.png
new file mode 100644
index 0000000000..081568695f
Binary files /dev/null and b/res/flags/EE.png differ
diff --git a/res/flags/EG.png b/res/flags/EG.png
new file mode 100644
index 0000000000..7e9d6c5cc1
Binary files /dev/null and b/res/flags/EG.png differ
diff --git a/res/flags/EH.png b/res/flags/EH.png
new file mode 100644
index 0000000000..f8e59b21fc
Binary files /dev/null and b/res/flags/EH.png differ
diff --git a/res/flags/ER.png b/res/flags/ER.png
new file mode 100644
index 0000000000..ffeb28dac8
Binary files /dev/null and b/res/flags/ER.png differ
diff --git a/res/flags/ES.png b/res/flags/ES.png
new file mode 100644
index 0000000000..3ce59fe891
Binary files /dev/null and b/res/flags/ES.png differ
diff --git a/res/flags/ET.png b/res/flags/ET.png
new file mode 100644
index 0000000000..f9d92859c4
Binary files /dev/null and b/res/flags/ET.png differ
diff --git a/res/flags/FI.png b/res/flags/FI.png
new file mode 100644
index 0000000000..0930988c29
Binary files /dev/null and b/res/flags/FI.png differ
diff --git a/res/flags/FJ.png b/res/flags/FJ.png
new file mode 100644
index 0000000000..2a78075da4
Binary files /dev/null and b/res/flags/FJ.png differ
diff --git a/res/flags/FK.png b/res/flags/FK.png
new file mode 100644
index 0000000000..52543390c7
Binary files /dev/null and b/res/flags/FK.png differ
diff --git a/res/flags/FM.png b/res/flags/FM.png
new file mode 100644
index 0000000000..0ba546ed38
Binary files /dev/null and b/res/flags/FM.png differ
diff --git a/res/flags/FO.png b/res/flags/FO.png
new file mode 100644
index 0000000000..2a0cd64579
Binary files /dev/null and b/res/flags/FO.png differ
diff --git a/res/flags/FR.png b/res/flags/FR.png
new file mode 100644
index 0000000000..ef05d74bc7
Binary files /dev/null and b/res/flags/FR.png differ
diff --git a/res/flags/GA.png b/res/flags/GA.png
new file mode 100644
index 0000000000..6539d6dd21
Binary files /dev/null and b/res/flags/GA.png differ
diff --git a/res/flags/GB.png b/res/flags/GB.png
new file mode 100644
index 0000000000..2938e61b8b
Binary files /dev/null and b/res/flags/GB.png differ
diff --git a/res/flags/GD.png b/res/flags/GD.png
new file mode 100644
index 0000000000..a55638e7ed
Binary files /dev/null and b/res/flags/GD.png differ
diff --git a/res/flags/GE.png b/res/flags/GE.png
new file mode 100644
index 0000000000..c6cfd2b069
Binary files /dev/null and b/res/flags/GE.png differ
diff --git a/res/flags/GF.png b/res/flags/GF.png
new file mode 100644
index 0000000000..dfc1badffc
Binary files /dev/null and b/res/flags/GF.png differ
diff --git a/res/flags/GG.png b/res/flags/GG.png
new file mode 100644
index 0000000000..a79f8c1f30
Binary files /dev/null and b/res/flags/GG.png differ
diff --git a/res/flags/GH.png b/res/flags/GH.png
new file mode 100644
index 0000000000..bda5d6f661
Binary files /dev/null and b/res/flags/GH.png differ
diff --git a/res/flags/GI.png b/res/flags/GI.png
new file mode 100644
index 0000000000..620b50b3df
Binary files /dev/null and b/res/flags/GI.png differ
diff --git a/res/flags/GL.png b/res/flags/GL.png
new file mode 100644
index 0000000000..c3d6bcf36b
Binary files /dev/null and b/res/flags/GL.png differ
diff --git a/res/flags/GM.png b/res/flags/GM.png
new file mode 100644
index 0000000000..fa2d771ee2
Binary files /dev/null and b/res/flags/GM.png differ
diff --git a/res/flags/GN.png b/res/flags/GN.png
new file mode 100644
index 0000000000..dabe7ce494
Binary files /dev/null and b/res/flags/GN.png differ
diff --git a/res/flags/GP.png b/res/flags/GP.png
new file mode 100644
index 0000000000..7bf7695635
Binary files /dev/null and b/res/flags/GP.png differ
diff --git a/res/flags/GQ.png b/res/flags/GQ.png
new file mode 100644
index 0000000000..edae61e9e8
Binary files /dev/null and b/res/flags/GQ.png differ
diff --git a/res/flags/GR.png b/res/flags/GR.png
new file mode 100644
index 0000000000..5abc59d393
Binary files /dev/null and b/res/flags/GR.png differ
diff --git a/res/flags/GS.png b/res/flags/GS.png
new file mode 100644
index 0000000000..baa930d0a3
Binary files /dev/null and b/res/flags/GS.png differ
diff --git a/res/flags/GT.png b/res/flags/GT.png
new file mode 100644
index 0000000000..10ef0cdd16
Binary files /dev/null and b/res/flags/GT.png differ
diff --git a/res/flags/GU.png b/res/flags/GU.png
new file mode 100644
index 0000000000..166c121e1a
Binary files /dev/null and b/res/flags/GU.png differ
diff --git a/res/flags/GW.png b/res/flags/GW.png
new file mode 100644
index 0000000000..fb59de837c
Binary files /dev/null and b/res/flags/GW.png differ
diff --git a/res/flags/GY.png b/res/flags/GY.png
new file mode 100644
index 0000000000..65499a7ca3
Binary files /dev/null and b/res/flags/GY.png differ
diff --git a/res/flags/HK.png b/res/flags/HK.png
new file mode 100644
index 0000000000..3958838402
Binary files /dev/null and b/res/flags/HK.png differ
diff --git a/res/flags/HM.png b/res/flags/HM.png
new file mode 100644
index 0000000000..26a61cbff4
Binary files /dev/null and b/res/flags/HM.png differ
diff --git a/res/flags/HN.png b/res/flags/HN.png
new file mode 100644
index 0000000000..bf923cb81b
Binary files /dev/null and b/res/flags/HN.png differ
diff --git a/res/flags/HR.png b/res/flags/HR.png
new file mode 100644
index 0000000000..139e143b8f
Binary files /dev/null and b/res/flags/HR.png differ
diff --git a/res/flags/HT.png b/res/flags/HT.png
new file mode 100644
index 0000000000..2583da392f
Binary files /dev/null and b/res/flags/HT.png differ
diff --git a/res/flags/HU.png b/res/flags/HU.png
new file mode 100644
index 0000000000..625846af53
Binary files /dev/null and b/res/flags/HU.png differ
diff --git a/res/flags/ID.png b/res/flags/ID.png
new file mode 100644
index 0000000000..f88d48af94
Binary files /dev/null and b/res/flags/ID.png differ
diff --git a/res/flags/IE.png b/res/flags/IE.png
new file mode 100644
index 0000000000..17f255fc26
Binary files /dev/null and b/res/flags/IE.png differ
diff --git a/res/flags/IL.png b/res/flags/IL.png
new file mode 100644
index 0000000000..6c9a6b57d8
Binary files /dev/null and b/res/flags/IL.png differ
diff --git a/res/flags/IM.png b/res/flags/IM.png
new file mode 100644
index 0000000000..936e801d72
Binary files /dev/null and b/res/flags/IM.png differ
diff --git a/res/flags/IN.png b/res/flags/IN.png
new file mode 100644
index 0000000000..ecba2f9c48
Binary files /dev/null and b/res/flags/IN.png differ
diff --git a/res/flags/IO.png b/res/flags/IO.png
new file mode 100644
index 0000000000..b0edb1610f
Binary files /dev/null and b/res/flags/IO.png differ
diff --git a/res/flags/IQ.png b/res/flags/IQ.png
new file mode 100644
index 0000000000..19055f14f7
Binary files /dev/null and b/res/flags/IQ.png differ
diff --git a/res/flags/IR.png b/res/flags/IR.png
new file mode 100644
index 0000000000..9056d21ec2
Binary files /dev/null and b/res/flags/IR.png differ
diff --git a/res/flags/IS.png b/res/flags/IS.png
new file mode 100644
index 0000000000..06be01a879
Binary files /dev/null and b/res/flags/IS.png differ
diff --git a/res/flags/IT.png b/res/flags/IT.png
new file mode 100644
index 0000000000..50e17b22a9
Binary files /dev/null and b/res/flags/IT.png differ
diff --git a/res/flags/JE.png b/res/flags/JE.png
new file mode 100644
index 0000000000..456a1a837e
Binary files /dev/null and b/res/flags/JE.png differ
diff --git a/res/flags/JM.png b/res/flags/JM.png
new file mode 100644
index 0000000000..5e4e73d325
Binary files /dev/null and b/res/flags/JM.png differ
diff --git a/res/flags/JO.png b/res/flags/JO.png
new file mode 100644
index 0000000000..5982705bbe
Binary files /dev/null and b/res/flags/JO.png differ
diff --git a/res/flags/JP.png b/res/flags/JP.png
new file mode 100644
index 0000000000..009a990a49
Binary files /dev/null and b/res/flags/JP.png differ
diff --git a/res/flags/KE.png b/res/flags/KE.png
new file mode 100644
index 0000000000..b5a9f733e4
Binary files /dev/null and b/res/flags/KE.png differ
diff --git a/res/flags/KG.png b/res/flags/KG.png
new file mode 100644
index 0000000000..acf6646b8a
Binary files /dev/null and b/res/flags/KG.png differ
diff --git a/res/flags/KH.png b/res/flags/KH.png
new file mode 100644
index 0000000000..58ad9c6175
Binary files /dev/null and b/res/flags/KH.png differ
diff --git a/res/flags/KI.png b/res/flags/KI.png
new file mode 100644
index 0000000000..49902d25aa
Binary files /dev/null and b/res/flags/KI.png differ
diff --git a/res/flags/KM.png b/res/flags/KM.png
new file mode 100644
index 0000000000..9fa9a454e1
Binary files /dev/null and b/res/flags/KM.png differ
diff --git a/res/flags/KN.png b/res/flags/KN.png
new file mode 100644
index 0000000000..3b39f8f7ae
Binary files /dev/null and b/res/flags/KN.png differ
diff --git a/res/flags/KP.png b/res/flags/KP.png
new file mode 100644
index 0000000000..eacc3ad0fd
Binary files /dev/null and b/res/flags/KP.png differ
diff --git a/res/flags/KR.png b/res/flags/KR.png
new file mode 100644
index 0000000000..a0df8da033
Binary files /dev/null and b/res/flags/KR.png differ
diff --git a/res/flags/KW.png b/res/flags/KW.png
new file mode 100644
index 0000000000..c6839950d8
Binary files /dev/null and b/res/flags/KW.png differ
diff --git a/res/flags/KY.png b/res/flags/KY.png
new file mode 100644
index 0000000000..3f82fa749e
Binary files /dev/null and b/res/flags/KY.png differ
diff --git a/res/flags/KZ.png b/res/flags/KZ.png
new file mode 100644
index 0000000000..4b43621212
Binary files /dev/null and b/res/flags/KZ.png differ
diff --git a/res/flags/LA.png b/res/flags/LA.png
new file mode 100644
index 0000000000..ee9c41ea18
Binary files /dev/null and b/res/flags/LA.png differ
diff --git a/res/flags/LB.png b/res/flags/LB.png
new file mode 100644
index 0000000000..7b4d66537f
Binary files /dev/null and b/res/flags/LB.png differ
diff --git a/res/flags/LC.png b/res/flags/LC.png
new file mode 100644
index 0000000000..d97f8d8dc7
Binary files /dev/null and b/res/flags/LC.png differ
diff --git a/res/flags/LI.png b/res/flags/LI.png
new file mode 100644
index 0000000000..c75a229fa8
Binary files /dev/null and b/res/flags/LI.png differ
diff --git a/res/flags/LK.png b/res/flags/LK.png
new file mode 100644
index 0000000000..2ca1a0c167
Binary files /dev/null and b/res/flags/LK.png differ
diff --git a/res/flags/LR.png b/res/flags/LR.png
new file mode 100644
index 0000000000..41bf4a96ce
Binary files /dev/null and b/res/flags/LR.png differ
diff --git a/res/flags/LS.png b/res/flags/LS.png
new file mode 100644
index 0000000000..10cf81b054
Binary files /dev/null and b/res/flags/LS.png differ
diff --git a/res/flags/LT.png b/res/flags/LT.png
new file mode 100644
index 0000000000..17a36c71ce
Binary files /dev/null and b/res/flags/LT.png differ
diff --git a/res/flags/LU.png b/res/flags/LU.png
new file mode 100644
index 0000000000..675a891dd6
Binary files /dev/null and b/res/flags/LU.png differ
diff --git a/res/flags/LV.png b/res/flags/LV.png
new file mode 100644
index 0000000000..763a612026
Binary files /dev/null and b/res/flags/LV.png differ
diff --git a/res/flags/LY.png b/res/flags/LY.png
new file mode 100644
index 0000000000..5211a9024f
Binary files /dev/null and b/res/flags/LY.png differ
diff --git a/res/flags/MA.png b/res/flags/MA.png
new file mode 100644
index 0000000000..098db5009b
Binary files /dev/null and b/res/flags/MA.png differ
diff --git a/res/flags/MC.png b/res/flags/MC.png
new file mode 100644
index 0000000000..8d1a98132c
Binary files /dev/null and b/res/flags/MC.png differ
diff --git a/res/flags/MD.png b/res/flags/MD.png
new file mode 100644
index 0000000000..6ca6f734c9
Binary files /dev/null and b/res/flags/MD.png differ
diff --git a/res/flags/ME.png b/res/flags/ME.png
new file mode 100644
index 0000000000..c7fccac3b9
Binary files /dev/null and b/res/flags/ME.png differ
diff --git a/res/flags/MF.png b/res/flags/MF.png
new file mode 100644
index 0000000000..7f6824e0ab
Binary files /dev/null and b/res/flags/MF.png differ
diff --git a/res/flags/MG.png b/res/flags/MG.png
new file mode 100644
index 0000000000..55bc89850a
Binary files /dev/null and b/res/flags/MG.png differ
diff --git a/res/flags/MH.png b/res/flags/MH.png
new file mode 100644
index 0000000000..4484977945
Binary files /dev/null and b/res/flags/MH.png differ
diff --git a/res/flags/MK.png b/res/flags/MK.png
new file mode 100644
index 0000000000..ef8d2e55ee
Binary files /dev/null and b/res/flags/MK.png differ
diff --git a/res/flags/ML.png b/res/flags/ML.png
new file mode 100644
index 0000000000..b8c5737f3d
Binary files /dev/null and b/res/flags/ML.png differ
diff --git a/res/flags/MM.png b/res/flags/MM.png
new file mode 100644
index 0000000000..afac494059
Binary files /dev/null and b/res/flags/MM.png differ
diff --git a/res/flags/MN.png b/res/flags/MN.png
new file mode 100644
index 0000000000..6e3de3381b
Binary files /dev/null and b/res/flags/MN.png differ
diff --git a/res/flags/MO.png b/res/flags/MO.png
new file mode 100644
index 0000000000..02118edf4b
Binary files /dev/null and b/res/flags/MO.png differ
diff --git a/res/flags/MP.png b/res/flags/MP.png
new file mode 100644
index 0000000000..a85be51b1b
Binary files /dev/null and b/res/flags/MP.png differ
diff --git a/res/flags/MQ.png b/res/flags/MQ.png
new file mode 100644
index 0000000000..92eb07275d
Binary files /dev/null and b/res/flags/MQ.png differ
diff --git a/res/flags/MR.png b/res/flags/MR.png
new file mode 100644
index 0000000000..95a5272652
Binary files /dev/null and b/res/flags/MR.png differ
diff --git a/res/flags/MS.png b/res/flags/MS.png
new file mode 100644
index 0000000000..a811c5bd0f
Binary files /dev/null and b/res/flags/MS.png differ
diff --git a/res/flags/MT.png b/res/flags/MT.png
new file mode 100644
index 0000000000..857672bf3a
Binary files /dev/null and b/res/flags/MT.png differ
diff --git a/res/flags/MU.png b/res/flags/MU.png
new file mode 100644
index 0000000000..8f6abb7331
Binary files /dev/null and b/res/flags/MU.png differ
diff --git a/res/flags/MV.png b/res/flags/MV.png
new file mode 100644
index 0000000000..bdb8119f5f
Binary files /dev/null and b/res/flags/MV.png differ
diff --git a/res/flags/MW.png b/res/flags/MW.png
new file mode 100644
index 0000000000..c684776a33
Binary files /dev/null and b/res/flags/MW.png differ
diff --git a/res/flags/MX.png b/res/flags/MX.png
new file mode 100644
index 0000000000..aee282de37
Binary files /dev/null and b/res/flags/MX.png differ
diff --git a/res/flags/MY.png b/res/flags/MY.png
new file mode 100644
index 0000000000..3941aa8cb1
Binary files /dev/null and b/res/flags/MY.png differ
diff --git a/res/flags/MZ.png b/res/flags/MZ.png
new file mode 100644
index 0000000000..dd497c23c1
Binary files /dev/null and b/res/flags/MZ.png differ
diff --git a/res/flags/NA.png b/res/flags/NA.png
new file mode 100644
index 0000000000..68e4aeabe6
Binary files /dev/null and b/res/flags/NA.png differ
diff --git a/res/flags/NC.png b/res/flags/NC.png
new file mode 100644
index 0000000000..ffcc21662b
Binary files /dev/null and b/res/flags/NC.png differ
diff --git a/res/flags/NE.png b/res/flags/NE.png
new file mode 100644
index 0000000000..08950d2f37
Binary files /dev/null and b/res/flags/NE.png differ
diff --git a/res/flags/NF.png b/res/flags/NF.png
new file mode 100644
index 0000000000..2728ed548b
Binary files /dev/null and b/res/flags/NF.png differ
diff --git a/res/flags/NG.png b/res/flags/NG.png
new file mode 100644
index 0000000000..5812b2d29c
Binary files /dev/null and b/res/flags/NG.png differ
diff --git a/res/flags/NI.png b/res/flags/NI.png
new file mode 100644
index 0000000000..d09e132955
Binary files /dev/null and b/res/flags/NI.png differ
diff --git a/res/flags/NL.png b/res/flags/NL.png
new file mode 100644
index 0000000000..f920328273
Binary files /dev/null and b/res/flags/NL.png differ
diff --git a/res/flags/NO.png b/res/flags/NO.png
new file mode 100644
index 0000000000..0bedee3f18
Binary files /dev/null and b/res/flags/NO.png differ
diff --git a/res/flags/NP.png b/res/flags/NP.png
new file mode 100644
index 0000000000..e7775c2516
Binary files /dev/null and b/res/flags/NP.png differ
diff --git a/res/flags/NR.png b/res/flags/NR.png
new file mode 100644
index 0000000000..4760404ba6
Binary files /dev/null and b/res/flags/NR.png differ
diff --git a/res/flags/NU.png b/res/flags/NU.png
new file mode 100644
index 0000000000..7c130d5b88
Binary files /dev/null and b/res/flags/NU.png differ
diff --git a/res/flags/NZ.png b/res/flags/NZ.png
new file mode 100644
index 0000000000..67c98728fc
Binary files /dev/null and b/res/flags/NZ.png differ
diff --git a/res/flags/OM.png b/res/flags/OM.png
new file mode 100644
index 0000000000..a6762503fa
Binary files /dev/null and b/res/flags/OM.png differ
diff --git a/res/flags/PA.png b/res/flags/PA.png
new file mode 100644
index 0000000000..ed18bddaf6
Binary files /dev/null and b/res/flags/PA.png differ
diff --git a/res/flags/PE.png b/res/flags/PE.png
new file mode 100644
index 0000000000..7485279cb6
Binary files /dev/null and b/res/flags/PE.png differ
diff --git a/res/flags/PF.png b/res/flags/PF.png
new file mode 100644
index 0000000000..6623f41346
Binary files /dev/null and b/res/flags/PF.png differ
diff --git a/res/flags/PG.png b/res/flags/PG.png
new file mode 100644
index 0000000000..92504c5147
Binary files /dev/null and b/res/flags/PG.png differ
diff --git a/res/flags/PH.png b/res/flags/PH.png
new file mode 100644
index 0000000000..d6d676210d
Binary files /dev/null and b/res/flags/PH.png differ
diff --git a/res/flags/PK.png b/res/flags/PK.png
new file mode 100644
index 0000000000..f7c8bb94e8
Binary files /dev/null and b/res/flags/PK.png differ
diff --git a/res/flags/PL.png b/res/flags/PL.png
new file mode 100644
index 0000000000..8303b1ea89
Binary files /dev/null and b/res/flags/PL.png differ
diff --git a/res/flags/PM.png b/res/flags/PM.png
new file mode 100644
index 0000000000..2507c86eae
Binary files /dev/null and b/res/flags/PM.png differ
diff --git a/res/flags/PN.png b/res/flags/PN.png
new file mode 100644
index 0000000000..c5e1d88463
Binary files /dev/null and b/res/flags/PN.png differ
diff --git a/res/flags/PR.png b/res/flags/PR.png
new file mode 100644
index 0000000000..938c83502f
Binary files /dev/null and b/res/flags/PR.png differ
diff --git a/res/flags/PS.png b/res/flags/PS.png
new file mode 100644
index 0000000000..d106ba89fa
Binary files /dev/null and b/res/flags/PS.png differ
diff --git a/res/flags/PT.png b/res/flags/PT.png
new file mode 100644
index 0000000000..168f060570
Binary files /dev/null and b/res/flags/PT.png differ
diff --git a/res/flags/PW.png b/res/flags/PW.png
new file mode 100644
index 0000000000..2d6e5d5b51
Binary files /dev/null and b/res/flags/PW.png differ
diff --git a/res/flags/PY.png b/res/flags/PY.png
new file mode 100644
index 0000000000..9cae9a780c
Binary files /dev/null and b/res/flags/PY.png differ
diff --git a/res/flags/QA.png b/res/flags/QA.png
new file mode 100644
index 0000000000..ce9d31edaf
Binary files /dev/null and b/res/flags/QA.png differ
diff --git a/res/flags/RE.png b/res/flags/RE.png
new file mode 100644
index 0000000000..85c2571022
Binary files /dev/null and b/res/flags/RE.png differ
diff --git a/res/flags/RO.png b/res/flags/RO.png
new file mode 100644
index 0000000000..e77996d5ad
Binary files /dev/null and b/res/flags/RO.png differ
diff --git a/res/flags/RS.png b/res/flags/RS.png
new file mode 100644
index 0000000000..fc7a2ab717
Binary files /dev/null and b/res/flags/RS.png differ
diff --git a/res/flags/RU.png b/res/flags/RU.png
new file mode 100644
index 0000000000..8b3df77988
Binary files /dev/null and b/res/flags/RU.png differ
diff --git a/res/flags/RW.png b/res/flags/RW.png
new file mode 100644
index 0000000000..87f718674e
Binary files /dev/null and b/res/flags/RW.png differ
diff --git a/res/flags/SA.png b/res/flags/SA.png
new file mode 100644
index 0000000000..d93b91c7c4
Binary files /dev/null and b/res/flags/SA.png differ
diff --git a/res/flags/SB.png b/res/flags/SB.png
new file mode 100644
index 0000000000..e9a2a8f3f0
Binary files /dev/null and b/res/flags/SB.png differ
diff --git a/res/flags/SC.png b/res/flags/SC.png
new file mode 100644
index 0000000000..488ac3bef3
Binary files /dev/null and b/res/flags/SC.png differ
diff --git a/res/flags/SD.png b/res/flags/SD.png
new file mode 100644
index 0000000000..6ba8c5cac3
Binary files /dev/null and b/res/flags/SD.png differ
diff --git a/res/flags/SE.png b/res/flags/SE.png
new file mode 100644
index 0000000000..e7bd806f4f
Binary files /dev/null and b/res/flags/SE.png differ
diff --git a/res/flags/SG.png b/res/flags/SG.png
new file mode 100644
index 0000000000..797069fc9e
Binary files /dev/null and b/res/flags/SG.png differ
diff --git a/res/flags/SH.png b/res/flags/SH.png
new file mode 100644
index 0000000000..b2c589d0c5
Binary files /dev/null and b/res/flags/SH.png differ
diff --git a/res/flags/SI.png b/res/flags/SI.png
new file mode 100644
index 0000000000..be8e7a8973
Binary files /dev/null and b/res/flags/SI.png differ
diff --git a/res/flags/SJ.png b/res/flags/SJ.png
new file mode 100644
index 0000000000..1dd7e78627
Binary files /dev/null and b/res/flags/SJ.png differ
diff --git a/res/flags/SK.png b/res/flags/SK.png
new file mode 100644
index 0000000000..be3d10f221
Binary files /dev/null and b/res/flags/SK.png differ
diff --git a/res/flags/SL.png b/res/flags/SL.png
new file mode 100644
index 0000000000..b3f997b163
Binary files /dev/null and b/res/flags/SL.png differ
diff --git a/res/flags/SM.png b/res/flags/SM.png
new file mode 100644
index 0000000000..b30f77ad69
Binary files /dev/null and b/res/flags/SM.png differ
diff --git a/res/flags/SN.png b/res/flags/SN.png
new file mode 100644
index 0000000000..b5cdb2101d
Binary files /dev/null and b/res/flags/SN.png differ
diff --git a/res/flags/SO.png b/res/flags/SO.png
new file mode 100644
index 0000000000..5f80850834
Binary files /dev/null and b/res/flags/SO.png differ
diff --git a/res/flags/SR.png b/res/flags/SR.png
new file mode 100644
index 0000000000..a2d124e92b
Binary files /dev/null and b/res/flags/SR.png differ
diff --git a/res/flags/SS.png b/res/flags/SS.png
new file mode 100644
index 0000000000..19c65899c2
Binary files /dev/null and b/res/flags/SS.png differ
diff --git a/res/flags/ST.png b/res/flags/ST.png
new file mode 100644
index 0000000000..1d2befe46d
Binary files /dev/null and b/res/flags/ST.png differ
diff --git a/res/flags/SV.png b/res/flags/SV.png
new file mode 100644
index 0000000000..fc3a9ca40d
Binary files /dev/null and b/res/flags/SV.png differ
diff --git a/res/flags/SX.png b/res/flags/SX.png
new file mode 100644
index 0000000000..6051aaa624
Binary files /dev/null and b/res/flags/SX.png differ
diff --git a/res/flags/SY.png b/res/flags/SY.png
new file mode 100644
index 0000000000..0d51d071fb
Binary files /dev/null and b/res/flags/SY.png differ
diff --git a/res/flags/SZ.png b/res/flags/SZ.png
new file mode 100644
index 0000000000..a7366cb638
Binary files /dev/null and b/res/flags/SZ.png differ
diff --git a/res/flags/TC.png b/res/flags/TC.png
new file mode 100644
index 0000000000..39971bb9b2
Binary files /dev/null and b/res/flags/TC.png differ
diff --git a/res/flags/TD.png b/res/flags/TD.png
new file mode 100644
index 0000000000..1fb647d488
Binary files /dev/null and b/res/flags/TD.png differ
diff --git a/res/flags/TF.png b/res/flags/TF.png
new file mode 100644
index 0000000000..41bd93343a
Binary files /dev/null and b/res/flags/TF.png differ
diff --git a/res/flags/TG.png b/res/flags/TG.png
new file mode 100644
index 0000000000..560fc0988b
Binary files /dev/null and b/res/flags/TG.png differ
diff --git a/res/flags/TH.png b/res/flags/TH.png
new file mode 100644
index 0000000000..9ee5ce8997
Binary files /dev/null and b/res/flags/TH.png differ
diff --git a/res/flags/TJ.png b/res/flags/TJ.png
new file mode 100644
index 0000000000..ca4be07739
Binary files /dev/null and b/res/flags/TJ.png differ
diff --git a/res/flags/TK.png b/res/flags/TK.png
new file mode 100644
index 0000000000..88a7eb1a24
Binary files /dev/null and b/res/flags/TK.png differ
diff --git a/res/flags/TL.png b/res/flags/TL.png
new file mode 100644
index 0000000000..fa6c365b9b
Binary files /dev/null and b/res/flags/TL.png differ
diff --git a/res/flags/TM.png b/res/flags/TM.png
new file mode 100644
index 0000000000..6cc0539da6
Binary files /dev/null and b/res/flags/TM.png differ
diff --git a/res/flags/TN.png b/res/flags/TN.png
new file mode 100644
index 0000000000..1cc09ec6f0
Binary files /dev/null and b/res/flags/TN.png differ
diff --git a/res/flags/TO.png b/res/flags/TO.png
new file mode 100644
index 0000000000..44c42ce0d1
Binary files /dev/null and b/res/flags/TO.png differ
diff --git a/res/flags/TR.png b/res/flags/TR.png
new file mode 100644
index 0000000000..4e63d61b9c
Binary files /dev/null and b/res/flags/TR.png differ
diff --git a/res/flags/TT.png b/res/flags/TT.png
new file mode 100644
index 0000000000..3831347f56
Binary files /dev/null and b/res/flags/TT.png differ
diff --git a/res/flags/TV.png b/res/flags/TV.png
new file mode 100644
index 0000000000..2f24fbf728
Binary files /dev/null and b/res/flags/TV.png differ
diff --git a/res/flags/TW.png b/res/flags/TW.png
new file mode 100644
index 0000000000..cda05c9b4c
Binary files /dev/null and b/res/flags/TW.png differ
diff --git a/res/flags/TZ.png b/res/flags/TZ.png
new file mode 100644
index 0000000000..a60d5b3fa6
Binary files /dev/null and b/res/flags/TZ.png differ
diff --git a/res/flags/UA.png b/res/flags/UA.png
new file mode 100644
index 0000000000..f62089b695
Binary files /dev/null and b/res/flags/UA.png differ
diff --git a/res/flags/UG.png b/res/flags/UG.png
new file mode 100644
index 0000000000..8fb590e864
Binary files /dev/null and b/res/flags/UG.png differ
diff --git a/res/flags/US.png b/res/flags/US.png
new file mode 100644
index 0000000000..f6b7ab982d
Binary files /dev/null and b/res/flags/US.png differ
diff --git a/res/flags/UY.png b/res/flags/UY.png
new file mode 100644
index 0000000000..11abe8c100
Binary files /dev/null and b/res/flags/UY.png differ
diff --git a/res/flags/UZ.png b/res/flags/UZ.png
new file mode 100644
index 0000000000..5d9168a3ea
Binary files /dev/null and b/res/flags/UZ.png differ
diff --git a/res/flags/VA.png b/res/flags/VA.png
new file mode 100644
index 0000000000..4e5a92bdd7
Binary files /dev/null and b/res/flags/VA.png differ
diff --git a/res/flags/VC.png b/res/flags/VC.png
new file mode 100644
index 0000000000..4a8dfa41ea
Binary files /dev/null and b/res/flags/VC.png differ
diff --git a/res/flags/VE.png b/res/flags/VE.png
new file mode 100644
index 0000000000..3632def0ca
Binary files /dev/null and b/res/flags/VE.png differ
diff --git a/res/flags/VG.png b/res/flags/VG.png
new file mode 100644
index 0000000000..15a5e5fadb
Binary files /dev/null and b/res/flags/VG.png differ
diff --git a/res/flags/VI.png b/res/flags/VI.png
new file mode 100644
index 0000000000..986a53d2fe
Binary files /dev/null and b/res/flags/VI.png differ
diff --git a/res/flags/VN.png b/res/flags/VN.png
new file mode 100644
index 0000000000..f19db790e3
Binary files /dev/null and b/res/flags/VN.png differ
diff --git a/res/flags/VU.png b/res/flags/VU.png
new file mode 100644
index 0000000000..a322030a28
Binary files /dev/null and b/res/flags/VU.png differ
diff --git a/res/flags/WF.png b/res/flags/WF.png
new file mode 100644
index 0000000000..5f6e2bedaa
Binary files /dev/null and b/res/flags/WF.png differ
diff --git a/res/flags/WS.png b/res/flags/WS.png
new file mode 100644
index 0000000000..de43a37312
Binary files /dev/null and b/res/flags/WS.png differ
diff --git a/res/flags/YE.png b/res/flags/YE.png
new file mode 100644
index 0000000000..b132bc13c4
Binary files /dev/null and b/res/flags/YE.png differ
diff --git a/res/flags/YT.png b/res/flags/YT.png
new file mode 100644
index 0000000000..5c450dfb91
Binary files /dev/null and b/res/flags/YT.png differ
diff --git a/res/flags/ZA.png b/res/flags/ZA.png
new file mode 100644
index 0000000000..adec062d1d
Binary files /dev/null and b/res/flags/ZA.png differ
diff --git a/res/flags/ZM.png b/res/flags/ZM.png
new file mode 100644
index 0000000000..56287f589b
Binary files /dev/null and b/res/flags/ZM.png differ
diff --git a/res/flags/ZW.png b/res/flags/ZW.png
new file mode 100644
index 0000000000..e58dff382b
Binary files /dev/null and b/res/flags/ZW.png differ
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 5a43c4e6e5..8554b14674 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -3,21 +3,47 @@
// copies the resources into the webapp directory.
//
+// Languages are listed manually so we can choose when to include
+// a translation in the app (because having a translation with only
+// 3 strings translated is just frustrating)
+// This could readily be automated, but it's nice to explicitly
+// control when we languages are available.
+const INCLUDE_LANGS = [
+ //'be' Omitted because no translations in react-sdk
+ 'en_EN',
+ 'da',
+ 'de_DE',
+ 'fr',
+ 'be',
+ 'pt',
+ 'pt_BR',
+ 'ru',
+];
+
// cpx includes globbed parts of the filename in the destination, but excludes
// common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
// "dest/b/...".
const COPY_LIST = [
["res/manifest.json", "webapp"],
["res/{media,vector-icons}/**", "webapp"],
+ ["res/flags/*", "webapp/flags/"],
["src/skins/vector/{fonts,img}/**", "webapp"],
["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
- ["./config.json", "webapp", {directwatch: 1}],
+ ["./config.json", "webapp", { directwatch: 1 }],
];
+INCLUDE_LANGS.forEach(function(l) {
+ COPY_LIST.push([
+ l, "webapp/i18n/", { lang: 1 },
+ ]);
+});
+
const parseArgs = require('minimist');
const Cpx = require('cpx');
const chokidar = require('chokidar');
+const fs = require('fs');
+const rimraf = require('rimraf');
const argv = parseArgs(
process.argv.slice(2), {}
@@ -33,6 +59,15 @@ function errCheck(err) {
}
}
+// Check if webapp exists
+if (!fs.existsSync('webapp')) {
+ fs.mkdirSync('webapp');
+}
+// Check if i18n exists
+if (!fs.existsSync('webapp/i18n/')) {
+ fs.mkdirSync('webapp/i18n/');
+}
+
function next(i, err) {
errCheck(err);
@@ -44,10 +79,13 @@ function next(i, err) {
const source = ent[0];
const dest = ent[1];
const opts = ent[2] || {};
+ let cpx = undefined;
- const cpx = new Cpx.Cpx(source, dest);
+ if (!opts.lang) {
+ cpx = new Cpx.Cpx(source, dest);
+ }
- if (verbose) {
+ if (verbose && cpx) {
cpx.on("copy", (event) => {
console.log(`Copied: ${event.srcPath} --> ${event.dstPath}`);
});
@@ -56,7 +94,7 @@ function next(i, err) {
});
}
- const cb = (err) => {next(i+1, err)};
+ const cb = (err) => { next(i + 1, err) };
if (watch) {
if (opts.directwatch) {
@@ -64,20 +102,74 @@ function next(i, err) {
// which in the case of config.json is '.', which inevitably takes
// ages to crawl. So we create our own watcher on the files
// instead.
- const copy = () => {cpx.copy(errCheck)};
+ const copy = () => { cpx.copy(errCheck) };
chokidar.watch(source)
.on('add', copy)
.on('change', copy)
.on('ready', cb)
.on('error', errCheck);
+ } else if (opts.lang) {
+ const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + source + '.json';
+ const riotWebFile = 'src/i18n/strings/' + source + '.json';
+
+ const translations = {};
+ const makeLang = () => { genLangFile(source, dest) };
+ [reactSdkFile, riotWebFile].forEach(function(f) {
+ chokidar.watch(f)
+ .on('add', makeLang)
+ .on('change', makeLang)
+ //.on('ready', cb) We'd have to do this when both files are ready
+ .on('error', errCheck);
+ });
+ next(i + 1, err);
} else {
cpx.on('watch-ready', cb);
cpx.on("watch-error", cb);
cpx.watch();
}
+ } else if (opts.lang) {
+ genLangFile(source, dest);
+ next(i + 1, err);
} else {
cpx.copy(cb);
}
}
+function genLangFile(lang, dest) {
+ const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
+ const riotWebFile = 'src/i18n/strings/' + lang + '.json';
+
+ const translations = {};
+ [reactSdkFile, riotWebFile].forEach(function(f) {
+ if (fs.existsSync(f)) {
+ Object.assign(
+ translations,
+ JSON.parse(fs.readFileSync(f).toString())
+ );
+ }
+ });
+ fs.writeFileSync(dest + lang + '.json', JSON.stringify(translations, null, 4));
+ if (verbose) {
+ console.log("Generated language file: " + lang);
+ }
+}
+
+function genLangList() {
+ const languages = {};
+ INCLUDE_LANGS.forEach(function(lang) {
+ const normalizedLanguage = lang.toLowerCase().replace("_", "-");
+ const languageParts = normalizedLanguage.split('-');
+ if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
+ languages[languageParts[0]] = lang + '.json';
+ } else {
+ languages[normalizedLanguage] = lang + '.json';
+ }
+ });
+ fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4));
+ if (verbose) {
+ console.log("Generated language list");
+ }
+}
+
+genLangList();
next(0);
diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
new file mode 100755
index 0000000000..bbbc834152
--- /dev/null
+++ b/scripts/fetch-develop.deps.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+# Fetches the js-sdk and matrix-react-sdk dependencies for development
+# or testing purposes
+# If there exists a branch of that dependency with the same name as
+# the branch the current checkout is on, use that branch. Otherwise,
+# use develop.
+
+# Look in the many different CI env vars for which branch we're
+# building
+if [[ "$TRAVIS" == true ]]; then
+ curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+else
+ # ghprbSourceBranch for jenkins github pull request builder
+ # GIT_BRANCH for other jenkins builds
+ curbranch="${ghprbSourceBranch:-$GIT_BRANCH}"
+ # Otherwise look at the actual branch we're on
+ if [ -z "$curbranch" ]
+ then
+ curbranch=`git rev-parse --abbrev-ref HEAD`
+ fi
+fi
+
+echo "Determined branch to be $curbranch"
+
+function dodep() {
+ org=$1
+ repo=$2
+ rm -rf $repo || true
+ git clone https://github.com/$org/$repo.git $repo
+ pushd $repo
+ git checkout $curbranch || git checkout develop
+ echo "$repo set to branch "`git rev-parse --abbrev-ref HEAD`
+ popd
+}
+
+dodep matrix-org matrix-js-sdk
+dodep matrix-org matrix-react-sdk
+
+mkdir -p node_modules
+cd node_modules
+
+rm -r matrix-js-sdk 2> /dev/null
+ln -s ../matrix-js-sdk ./
+pushd matrix-js-sdk
+npm install
+popd
+
+rm -r matrix-react-sdk 2> /dev/null
+ln -s ../matrix-react-sdk ./
+pushd matrix-react-sdk
+mkdir -p node_modules
+cd node_modules
+ln -s ../../matrix-js-sdk matrix-js-sdk
+cd ..
+npm install
+popd
+# Link the reskindex binary in place: if we used npm link,
+# npm would do this for us, but we don't because we'd have
+# to define the npm prefix somewhere so it could put the
+# intermediate symlinks there. Instead, we do it ourselves.
+mkdir -p .bin
+ln -sf ../matrix-react-sdk/scripts/reskindex.js .bin/reskindex
diff --git a/scripts/genflags.sh b/scripts/genflags.sh
new file mode 100755
index 0000000000..826a0299f1
--- /dev/null
+++ b/scripts/genflags.sh
@@ -0,0 +1,66 @@
+# Copyright 2017 Vector Creations Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# genflags.sh - Generates pngs for use with CountryDropdown.js
+#
+# Dependencies:
+# - imagemagick --with-rsvg (because default imagemagick SVG
+# renderer does not produce accurate results)
+#
+# This will clone the googlei18n flag repo before converting
+# all phonenumber.js-supported country flags (as SVGs) into
+# PNGs that can be used by CountryDropdown.js.
+
+# Allow CTRL+C to terminate the script
+trap "echo Exited!; exit;" SIGINT SIGTERM
+
+# git clone the google repo to get flag SVGs
+git clone git@github.com:googlei18n/region-flags
+for f in region-flags/svg/*.svg; do
+ # Skip state flags
+ if [[ $f =~ [A-Z]{2}-[A-Z]{2,3}.svg ]] ; then
+ echo "Skipping state flag "$f
+ continue
+ fi
+
+ # Skip countries not included in phonenumber.js
+ if [[ $f =~ (AC|CP|DG|EA|EU|IC|TA|UM|UN|XK).svg ]] ; then
+ echo "Skipping non-phonenumber supported flag "$f
+ continue
+ fi
+
+ # Run imagemagick convert
+ # -background none : transparent background
+ # -thumbnail 25x15 : resize the flag to have a height of 15.
+ # By default, aspect ratio is respected so the width will
+ # be correct and not necessarily 25px.
+ # -gravity Center : keep the image central when adding an -extent
+ # -border 1 : add a 1px border around the flag
+ # -bordercolor : set the border colour
+ # -extent 27x27 : surround the image with padding so that it
+ # has the dimensions 27x27.
+ convert $f -background none -thumbnail 25x15 \
+ -gravity Center -border 1 -bordercolor \#e0e0e0 \
+ -extent 27x27 $f.png
+
+ # $f.png will be region-flags/svg/XX.svg.png at this point
+
+ # Extract filename from path $f
+ newname=${f##*/}
+ # Replace .svg with .png
+ newname=${newname%.svg}.png
+ # Move the file to flags directory
+ mv $f.png res/flags/$newname
+ echo "Generated res/flags/"$newname
+done
diff --git a/scripts/jenkins.sh b/scripts/jenkins.sh
index 312eea4543..4f2e940564 100755
--- a/scripts/jenkins.sh
+++ b/scripts/jenkins.sh
@@ -8,10 +8,13 @@ nvm use 6
set -x
+# check out corresponding branches of dependencies
+`dirname $0`/fetch-develop.deps.sh
+
npm install
# apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
-npm install matrix-react-sdk matrix-js-sdk olm
+npm install olm
# install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url
# from our package.json (or even matrix-js-sdk's) in preference.
@@ -23,11 +26,6 @@ npm install matrix-react-sdk matrix-js-sdk olm
#rm -r node_modules/olm
#cp -r olm/package node_modules/olm
-
-# we may be using dev branches of js-sdk and react-sdk, in which case we need to build them
-(cd node_modules/matrix-js-sdk && npm install)
-(cd node_modules/matrix-react-sdk && npm install)
-
# run the mocha tests
npm run test
@@ -36,11 +34,9 @@ npm run lintall -- -f checkstyle -o eslint.xml || true
rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
- # node_modules deps from 'npm install' don't have a .git dir so can't
- # rev-parse; but they do set the commit in package.json under 'gitHead' which
- # we're grabbing here.
-REACT_SHA=$(grep 'gitHead' node_modules/matrix-react-sdk/package.json | cut -d \" -f 4 | head -c 12)
-JSSDK_SHA=$(grep 'gitHead' node_modules/matrix-js-sdk/package.json | cut -d \" -f 4 | head -c 12)
+# Since the deps are fetched from git, we can rev-parse
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
diff --git a/scripts/package.sh b/scripts/package.sh
index cffb6d288b..23d0925b05 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -21,7 +21,7 @@ npm run build$dev
cp config.sample.json webapp/
mkdir -p dist
-cp -r webapp vector-$version
+cp -r webapp riot-$version
# if $version looks like semver with leading v, strip it before writing to file
if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index 63dfac60d8..c8c7ba2c06 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -1,6 +1,5 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,8 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import React from 'react';
-import sdk from 'matrix-react-sdk';
+'use strict';
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var sdk = require('matrix-react-sdk');
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
+var dis = require('matrix-react-sdk/lib/dispatcher');
+var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
module.exports = React.createClass({
displayName: 'BottomLeftMenu',
@@ -26,28 +31,121 @@ module.exports = React.createClass({
teamToken: React.PropTypes.string,
},
+ getInitialState: function() {
+ return({
+ directoryHover : false,
+ roomsHover : false,
+ homeHover: false,
+ peopleHover : false,
+ settingsHover : false,
+ });
+ },
+
+ // Room events
+ onDirectoryClick: function() {
+ dis.dispatch({ action: 'view_room_directory' });
+ },
+
+ onDirectoryMouseEnter: function() {
+ this.setState({ directoryHover: true });
+ },
+
+ onDirectoryMouseLeave: function() {
+ this.setState({ directoryHover: false });
+ },
+
+ onRoomsClick: function() {
+ dis.dispatch({ action: 'view_create_room' });
+ },
+
+ onRoomsMouseEnter: function() {
+ this.setState({ roomsHover: true });
+ },
+
+ onRoomsMouseLeave: function() {
+ this.setState({ roomsHover: false });
+ },
+
+ // Home button events
+ onHomeClick: function() {
+ dis.dispatch({ action: 'view_home_page' });
+ },
+
+ onHomeMouseEnter: function() {
+ this.setState({ homeHover: true });
+ },
+
+ onHomeMouseLeave: function() {
+ this.setState({ homeHover: false });
+ },
+
+ // People events
+ onPeopleClick: function() {
+ dis.dispatch({ action: 'view_create_chat' });
+ },
+
+ onPeopleMouseEnter: function() {
+ this.setState({ peopleHover: true });
+ },
+
+ onPeopleMouseLeave: function() {
+ this.setState({ peopleHover: false });
+ },
+
+ // Settings events
+ onSettingsClick: function() {
+ dis.dispatch({ action: 'view_user_settings' });
+ },
+
+ onSettingsMouseEnter: function() {
+ this.setState({ settingsHover: true });
+ },
+
+ onSettingsMouseLeave: function() {
+ this.setState({ settingsHover: false });
+ },
+
+ // Get the label/tooltip to show
+ getLabel: function(label, show) {
+ if (show) {
+ var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+ return