Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff

This commit is contained in:
Michael Telatynski 2017-06-11 23:13:49 +01:00
commit deb7ed660c
336 changed files with 2768 additions and 375 deletions

View file

@ -190,8 +190,8 @@ export default class WebPlatform extends VectorBasePlatform {
const appName = u.format();
const ua = new UAParser();
const browserName = ua.getBrowser().name;
const osName = ua.getOS().name;
const browserName = ua.getBrowser().name || "unknown browser";
const osName = ua.getOS().name || "unknown os";
return _t('%(appName)s via %(browserName)s on %(osName)s', {appName: appName, browserName: browserName, osName: osName});
}