Skip to content

Adapt electron prompt code for credential password #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 14, 2021
Merged

Adapt electron prompt code for credential password #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eff02bb
Add i18n when-ready promise to wait for initialization
rakillen Oct 13, 2021
ef07704
Add customized electron prompt dialog
rakillen Oct 13, 2021
a257200
Merge branch 'main' into electron-prompt
rakillen Oct 13, 2021
4430899
Merge branch 'main' into electron-prompt
rakillen Oct 13, 2021
2dd5aff
Make passphrase JS more dialog-specific; expose i18n in passprase HTML
rakillen Oct 13, 2021
cca17cb
Set title tag with i18n
rakillen Oct 13, 2021
c7c07a8
Remove unused messages
rakillen Oct 13, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Set title tag with i18n
  • Loading branch information
@rakillen
rakillen committed Oct 13, 2021
commit cca17cbb19e88f62b8ec882fdd603d3b32c06ce2
2 changes: 1 addition & 1 deletion electron/app/js/prompt/credential-passphrase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-->
<html lang="en-us">
<head>
<title>...</title>
<title id="title">...</title>
<link href="prompt.css" rel="stylesheet" />
</head>
<body>
Expand Down
1 change: 1 addition & 0 deletions electron/app/js/prompt/credential-passphrase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ function promptRegister() {
document.querySelector('#ok').textContent = window.api.i18n.t('dialog-button-ok');
document.querySelector('#cancel').textContent = window.api.i18n.t('dialog-button-cancel');
document.querySelector('#label').textContent = window.api.i18n.t('dialog-passphrase-prompt-label');
document.querySelector('#title').textContent = window.api.i18n.t('dialog-passphrase-prompt-title');

const height = document.querySelector('body').offsetHeight;
window.api.ipc.sendSync('prompt-size:' + promptId, height);
Expand Down
2 changes: 0 additions & 2 deletions electron/app/js/promptUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
const path = require('path');
const { BrowserWindow, ipcMain } = require('electron');
const i18n = require('./i18next.config');

/* global __dirname */

Expand Down Expand Up @@ -33,7 +32,6 @@ async function getCredentialPassphrase(parentWindow) {
alwaysOnTop: false,
useContentSize: true,
modal: Boolean(parentWindow),
title: i18n.t('dialog-passphrase-prompt-title'),
menuBarVisible: false,
webPreferences: {
nodeIntegration: false,
Expand Down
1 change: 0 additions & 1 deletion electron/app/locales/en/electron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
"dialog-invalid-oracle-home-title": "Invalid Oracle Home Directory",
"dialog-invalid-oracle-home-not-specified": "Oracle Home is not specified.",
"dialog-invalid-oracle-home-not-valid": "Specified Oracle Home {{oracleHome}} is not valid.",
"dialog-passphrase-prompt-title": "Credential Encryption Passphrase",
"dialog-https-proxy-url-label": "HTTPS Proxy URL",
"dialog-bypass-proxy-hosts-label": "Bypass Proxy Hosts",

Expand Down
1 change: 1 addition & 0 deletions electron/app/locales/en/webui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
"user-settings-dialog-quickstart-skip-label": "Skip Showing Introduction at Startup",
"user-settings-dialog-quickstart-skip-help": "Whether or not to skip showing the WebLogic Kubernetes Toolkit UI Introduction at application startup.",

"dialog-passphrase-prompt-title": "Credential Encryption Passphrase",
"dialog-passphrase-prompt-label": "Please enter the passphrase to use to encrypt the project credential.",

"model-design-coming-soon": "Coming Soon...",
Expand Down