Merge remote-tracking branch 'origin/develop' into develop

Author: RiotTranslate

.travis.yml

@@ -5,5 +5,6 @@ install:
     - npm install
     - (cd node_modules/matrix-js-sdk && npm install)
 script:
-    - npm run test
-    - ./.travis-test-riot.sh
+    # don't run the riot tests unless the react-sdk tests pass, otherwise
+    # the output is confusing.
+    - npm run test && ./.travis-test-riot.sh

karma.conf.js

@@ -177,6 +177,11 @@ module.exports = function (config) {
                 ],
             },
             devtool: 'inline-source-map',
+            externals: {
+                // Don't try to bundle electron: leave it as a commonjs dependency
+                // (the 'commonjs' here means it will output a 'require')
+                "electron": "commonjs electron",
+            },
         },
 
         webpackMiddleware: {

scripts/fix-i18n.pl

@@ -52,6 +52,15 @@ BEGIN
 This room is inaccessible to guests. You may be able to join if you register.
 delete the alias.
 remove %(name)s from the directory.
+Conference call failed.
+Conference calling is in development and may not be reliable.
+Guest users can't create new rooms. Please register to create room and start a chat.
+Server may be unavailable, overloaded, or you hit a bug.
+Server unavailable, overloaded, or something else went wrong.
+You are already in a call.
+You cannot place VoIP calls in this browser.
+You cannot place a call with yourself.
+Your email address does not appear to be associated with a Matrix ID on this Homeserver.
 EOT
 )];
 }

src/CallHandler.js

@@ -226,7 +226,7 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     title: _t('Existing Call'),
-                    description: _t('You are already in a call') + '.',
+                    description: _t('You are already in a call.'),
                 });
                 return; // don't allow >1 call to be placed.
             }
@@ -236,7 +236,7 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     title: _t('VoIP is unsupported'),
-                    description: _t('You cannot place VoIP calls in this browser') + '.',
+                    description: _t('You cannot place VoIP calls in this browser.'),
                 });
                 return;
             }
@@ -251,7 +251,7 @@ function _onAction(payload) {
             if (members.length <= 1) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    description: _t('You cannot place a call with yourself') + '.',
+                    description: _t('You cannot place a call with yourself.'),
                 });
                 return;
             }
@@ -284,7 +284,7 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     title: _t('VoIP is unsupported'),
-                    description: _t('You cannot place VoIP calls in this browser') + '.',
+                    description: _t('You cannot place VoIP calls in this browser.'),
                 });
             }
             else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
@@ -303,7 +303,7 @@ function _onAction(payload) {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
                     title: _t('Warning!'),
-                    description: _t('Conference calling is in development and may not be reliable') + '.',
+                    description: _t('Conference calling is in development and may not be reliable.'),
                     onFinished: confirm=>{
                         if (confirm) {
                             ConferenceHandler.createNewMatrixCall(
@@ -315,7 +315,7 @@ function _onAction(payload) {
                                 console.error("Conference call failed: " + err);
                                 Modal.createDialog(ErrorDialog, {
                                     title: _t('Failed to set up conference call'),
-                                    description: _t('Conference call failed') + '. ' + ((err && err.message) ? err.message : ''),
+                                    description: _t('Conference call failed.') + ' ' + ((err && err.message) ? err.message : ''),
                                 });
                             });
                         }

src/Login.js

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import Matrix from "matrix-js-sdk";
+import { _t } from "./languageHandler";
 
 import q from 'q';
 import url from 'url';
@@ -97,9 +98,9 @@ export default class Login {
             };
         }, (error) => {
             if (error.httpStatus === 403) {
-                error.friendlyText = "Guest access is disabled on this Home Server.";
+                error.friendlyText = _t("Guest access is disabled on this Home Server.");
             } else {
-                error.friendlyText = "Failed to register as guest: " + error.data;
+                error.friendlyText = _t("Failed to register as guest:") + ' ' + error.data;
             }
             throw error;
         });
@@ -158,12 +159,12 @@ export default class Login {
         }, function(error) {
             if (error.httpStatus == 400 && loginParams.medium) {
                 error.friendlyText = (
-                    'This Home Server does not support login using email address.'
+                    _t('This Home Server does not support login using email address.')
                 );
             }
             else if (error.httpStatus === 403) {
                 error.friendlyText = (
-                    'Incorrect username and/or password.'
+                    _t('Incorrect username and/or password.')
                 );
                 if (self._fallbackHsUrl) {
                     var fbClient = Matrix.createClient({
@@ -187,7 +188,7 @@ export default class Login {
             }
             else {
                 error.friendlyText = (
-                    'There was a problem logging in. (HTTP ' + error.httpStatus + ")"
+                    _t("There was a problem logging in.") + ' (HTTP ' + error.httpStatus + ")"
                 );
             }
             throw error;

src/PasswordReset.js

@@ -82,7 +82,7 @@ class PasswordReset {
                 err.message = _t('Failed to verify email address: make sure you clicked the link in the email');
             }
             else if (err.httpStatus === 404) {
-                err.message = _t('Your email address does not appear to be associated with a Matrix ID on this Homeserver') + '.';
+                err.message = _t('Your email address does not appear to be associated with a Matrix ID on this Homeserver.');
             }
             else if (err.httpStatus) {
                 err.message += ` (Status ${err.httpStatus})`;

src/SlashCommands.js

@@ -186,7 +186,7 @@ const commands = {
                     if (targetRoomId) { break; }
                 }
                 if (!targetRoomId) {
-                    return reject("Unrecognised room alias: " + roomAlias);
+                    return reject(_t("Unrecognised room alias:") +  ' ' + roomAlias);
                 }
             }
         }
@@ -303,14 +303,14 @@ const commands = {
 
                 const device = MatrixClientPeg.get().getStoredDevice(userId, deviceId);
                 if (!device) {
-                    return reject(`Unknown (user, device) pair: (${userId}, ${deviceId})`);
+                    return reject(_t(`Unknown (user, device) pair:`) + ` (${userId}, ${deviceId})`);
                 }
 
                 if (device.isVerified()) {
                     if (device.getFingerprint() === fingerprint) {
-                        return reject(`Device already verified!`);
+                        return reject(_t(`Device already verified!`));
                     } else {
-                        return reject(`WARNING: Device already verified, but keys do NOT MATCH!`);
+                        return reject(_t(`WARNING: Device already verified, but keys do NOT MATCH!`));
                     }
                 }
 
@@ -322,12 +322,15 @@ const commands = {
                     // Tell the user we verified everything!
                     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                     Modal.createDialog(QuestionDialog, {
-                        title: "Verified key",
+                        title: _t("Verified key"),
                         description: (
                             <div>
                                 <p>
-                                    The signing key you provided matches the signing key you received
-                                    from { userId }'s device { deviceId }. Device marked as verified.
+                                {
+                                    _t("The signing key you provided matches the signing key you received " +
+                                    "from %(userId)s's device %(deviceId)s. Device marked as verified.",
+                                    {userId: userId, deviceId: deviceId})
+                                }
                                 </p>
                             </div>
                         ),
@@ -336,9 +339,13 @@ const commands = {
 
                     return success();
                 } else {
-                    return reject(`WARNING: KEY VERIFICATION FAILED! The signing key for ${userId} and device
-                            ${deviceId} is "${device.getFingerprint()}" which does not match the provided key
-                            "${fingerprint}". This could mean your communications are being intercepted!`);
+                    const fprint = device.getFingerprint();
+                    return reject(
+                        _t('WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device' +
+                           ' %(deviceId)s is "%(fprint)s" which does not match the provided key' +
+                           ' "%(fingerprint)s". This could mean your communications are being intercepted!',
+                            {deviceId: deviceId, fprint: fprint, userId: userId, fingerprint: fingerprint})
+                    );
                 }
             }
         }
@@ -383,7 +390,7 @@ module.exports = {
             if (commands[cmd]) {
                 return commands[cmd].run(roomId, args);
             } else {
-                return reject("Unrecognised command: " + input);
+                return reject(_t("Unrecognised command:") + ' ' + input);
             }
         }
         return null; // not a command

src/UserSettingsStore.js

@@ -17,24 +17,26 @@ limitations under the License.
 import q from 'q';
 import MatrixClientPeg from './MatrixClientPeg';
 import Notifier from './Notifier';
+import { _t } from './languageHandler';
 
 /*
  * TODO: Make things use this. This is all WIP - see UserSettings.js for usage.
  */
 
-/*
- * TODO: Find a way to translate the names of LABS_FEATURES. In other words, guarantee that languages were already loaded before building this array.
- */
-
 export default {
     LABS_FEATURES: [
         {
-            name: "New Composer & Autocomplete",
+            name: "-",
             id: 'rich_text_editor',
             default: false,
         },
     ],
 
+    // horrible but it works. The locality makes this somewhat more palatable.
+    doTranslations: function() {
+        this.LABS_FEATURES[0].name = _t("New Composer & Autocomplete");
+    },
+
     loadProfileInfo: function() {
         const cli = MatrixClientPeg.get();
         return cli.getProfileInfo(cli.credentials.userId);

src/async-components/views/dialogs/ExportE2eKeysDialog.js

@@ -166,11 +166,11 @@ export default React.createClass({
                         </div>
                     </div>
                     <div className='mx_Dialog_buttons'>
-                        <input className='mx_Dialog_primary' type='submit' value='Export'
+                        <input className='mx_Dialog_primary' type='submit' value={_t('Export')}
                              disabled={disableForm}
                         />
                         <button onClick={this._onCancelClick} disabled={disableForm}>
-                            Cancel
+                            {_t("Cancel")}
                         </button>
                     </div>
                 </form>

src/async-components/views/dialogs/ImportE2eKeysDialog.js

@@ -164,11 +164,11 @@ export default React.createClass({
                         </div>
                     </div>
                     <div className='mx_Dialog_buttons'>
-                        <input className='mx_Dialog_primary' type='submit' value='Import'
+                        <input className='mx_Dialog_primary' type='submit' value={_t('Import')}
                             disabled={!this.state.enableSubmit || disableForm}
                         />
                         <button onClick={this._onCancelClick} disabled={disableForm}>
-                            Cancel
+                            {_t("Cancel")}
                         </button>
                     </div>
                 </form>