if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

:typescript: - Fix screen sharing indicator text and format string

Browse Source
This commit is contained in:
Kiran Niranjan 2019-01-16 13:02:47 +05:30
parent 8fabaa5c56
commit 05bedadc77
9 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/browser/window-handler.ts
View File

@ -217,6 +217,7 @@ export class WindowHandler {
// only for Window and if it is enabled
await injectStyles(this.mainWindow, this.isCustomTitleBarAndWindowOS);
if (this.isCustomTitleBarAndWindowOS) this.mainWindow.webContents.send('initiate-custom-title-bar');
this.mainWindow.webContents.send('page-load', {
isWindowsOS,
locale: i18n.getLocale(),
@ -373,6 +374,12 @@ export class WindowHandler {
* @param id {number}
*/
public createScreenSharingIndicatorWindow(screenSharingWebContents: Electron.webContents, displayId: string, id: number): void {
if (this.screenSharingIndicatorWindow && !this.screenSharingIndicatorWindow.isDestroyed()) {
this.screenSharingIndicatorWindow.close();
this.screenSharingIndicatorWindow = null;
}
const indicatorScreen = (displayId && electron.screen.getAllDisplays().filter((d) => displayId.includes(d.id.toString()))[ 0 ]) || electron.screen.getPrimaryDisplay();
const screenRect = indicatorScreen.workArea;
let opts = WindowHandler.getScreenSharingIndicatorOpts();

4
src/common/format-string.ts
View File

@ -19,10 +19,10 @@ export const formatString = (str: string, data?: object): string => {
if (Object.prototype.hasOwnProperty.call(data, key)) {
return str.replace(/({([^}]+)})/g, (i) => {
const replacedKey = i.replace(/{/, '').replace(/}/, '');
if (!data[replacedKey]) {
if (!data[key] || !data[key][replacedKey]) {
return i;
}
return data[replacedKey];
return data[key][replacedKey];
});
}
}

2
src/locale/en-US.json
View File

@ -112,7 +112,7 @@
"Share": "Share"
},
"ScreenSharingIndicator": {
"You are sharing your screen on Symphony": "You are sharing your screen on Symphony",
"You are sharing your screen on {appName}": "You are sharing your screen on {appName}",
"Stop sharing": "Stop sharing",
"Hide": "Hide"
},

2
src/locale/en.json
View File

@ -110,7 +110,7 @@
"Share": "Share"
},
"ScreenSharingIndicator": {
"You are sharing your screen on Symphony": "You are sharing your screen on Symphony",
"You are sharing your screen on {appName}": "You are sharing your screen on {appName}",
"Stop sharing": "Stop sharing",
"Hide": "Hide"
},

2
src/locale/fr-FR.json
View File

@ -110,7 +110,7 @@
"Share":"Partager"
},
"ScreenSharingIndicator": {
"You are sharing your screen on Symphony": "Vous partagez votre écran sur Symphony",
"You are sharing your screen on {appName}": "Vous partagez votre écran sur {appName}",
"Stop sharing": "Arrêter le partage",
"Hide": "Masquer"
},

2
src/locale/fr.json
View File

@ -110,7 +110,7 @@
"Share":"Partager"
},
"ScreenSharingIndicator": {
"You are sharing your screen on Symphony": "Vous partagez votre écran sur Symphony",
"You are sharing your screen on {appName}": "Vous partagez votre écran sur {appName}",
"Stop sharing": "Arrêter le partage",
"Hide": "Masquer"
},

2
src/locale/ja-JP.json
View File

@ -112,7 +112,7 @@
"Share": "共有"
},
"ScreenSharingIndicator": {
"You are sharing your screen on Symphony": "あなたはSymphony上であなたの画面を共有しています",
"You are sharing your screen on {appName}": "あなたは{appName}上であなたの画面を共有しています",
"Stop Sharing": "共有を停止",
"Hide": "非表示にする"
},

2
src/locale/ja.json
View File

@ -110,7 +110,7 @@
"Share": "共有"
},
"ScreenSharingIndicator": {
"You are sharing your screen on Symphony": "あなたはSymphony上であなたの画面を共有しています",
"You are sharing your screen on {appName}": "あなたは{appName}上であなたの画面を共有しています",
"Stop Sharing": "共有を停止",
"Hide": "非表示にする"
},

3
src/renderer/components/screen-sharing-indicator.tsx
View File

@ -36,8 +36,7 @@ export default class ScreenSharingIndicator extends React.Component<{}, IState>
return (
<div className={classNames('ScreenSharingIndicator', { mac: isMac })}>
<span className='drag-area'/>
<span className='text-label'>{i18n.t(`You are sharing your screen on `, namespace)()}</span>
<span className='text-label'><b>{remote.app.getName()}</b></span>
<span className='text-label'>{i18n.t(`You are sharing your screen on {appName}`, namespace)({ appName: remote.app.getName() })}</span>
<span className='buttons'>
<a className='hide-button' href='#' onClick={() => this.eventHandlers.onClose(id)}>{i18n.t('Hide', namespace)()}</a>
<button className='stop-sharing-button' onClick={() => this.eventHandlers.onStopScreenSharing(id)}>