Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/pgadmin/dashboard/static/js/Dashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ function Dashboard({
})
.then((res) => {
if (res?.data?.['logs_disabled']) {
setSsMsg(gettext('Please enable the logging to view the server logs or check the log file is in place or not.'));
setSsMsg(gettext('Please enable logging to view the server logs, or check if the log file is in place.'));
} else {
setDashData(parseData(res.data));
}
Expand Down
4 changes: 2 additions & 2 deletions web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export default function Summary({preferences, sid, did, pageVisible, enablePoll=
{ icon: '', name: gettext('Host name'), value: gettext(os_info_obj['host_name']) },
{ icon: '', name: gettext('Domain name'), value: gettext(os_info_obj['domain_name']) },
{ icon: '', name: gettext('Architecture'), value: gettext(os_info_obj['architecture']) },
{ icon: '', name: gettext('Os up since seconds'), value: gettext(os_info_obj['os_up_since_seconds']) },
{ icon: '', name: gettext('OS uptime (seconds)'), value: gettext(os_info_obj['os_up_since_seconds']) },
];
setOsStats(os_info_list);

Expand All @@ -145,7 +145,7 @@ export default function Summary({preferences, sid, did, pageVisible, enablePoll=
{ icon: '', name: gettext('Vendor'), value: gettext(cpu_info_obj['vendor']) },
{ icon: '', name: gettext('Description'), value: gettext(cpu_info_obj['description']) },
{ icon: '', name: gettext('Model name'), value: gettext(cpu_info_obj['model_name']) },
{ icon: '', name: gettext('No of cores'), value: gettext(cpu_info_obj['no_of_cores']) },
{ icon: '', name: gettext('Number of cores'), value: gettext(cpu_info_obj['no_of_cores']) },
{ icon: '', name: gettext('Architecture'), value: gettext(cpu_info_obj['architecture']) },
{ icon: '', name: gettext('Clock speed Hz'), value: gettext(cpu_info_obj['clock_speed_hz']) },
{ icon: '', name: gettext('L1 dcache size'), value: gettext(cpu_info_obj['l1dcache_size']) },
Expand Down
4 changes: 2 additions & 2 deletions web/pgadmin/misc/cloud/static/js/CloudWizard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose, cloudPanelId}
<WizardStep stepId={1} >
<Box sx={{ position: 'relative',top: '20%'}}>
{cloudProvider == CLOUD_PROVIDERS.BIGANIMAL && <Box sx={{ marginBottom: '1em', display: 'flex'}}>
<Box>{gettext('The verification code to authenticate the pgAdmin to EDB BigAnimal is: ')} <strong>{verificationCode}</strong>
<br/>{gettext('By clicking the below button, you will be redirected to the EDB BigAnimal authentication page in a new tab.')}
<Box>{gettext('The verification code to authenticate pgAdmin to EDB BigAnimal is: ')} <strong>{verificationCode}</strong>
<br/>{gettext('By clicking the button below, you will be redirected to the EDB BigAnimal authentication page in a new tab.')}
</Box>
</Box>}
{cloudProvider == CLOUD_PROVIDERS.BIGANIMAL && <PrimaryButton onClick={authenticateBigAnimal} disabled={verificationIntiated}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ export default function WorkspaceWelcomePage({ mode }) {
let welcomeIcon = <QueryToolIcon style={{height: '1.5rem'}} />;
let welcomeTitle = gettext('Welcome to the Query Tool Workspace!');
let welcomeFirst = gettext('The Query Tool is a robust and versatile environment designed for executing SQL commands and reviewing result sets efficiently.');
let welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple query tabs, making it easier to organize your work. You can select the existing servers or create a completely new ad-hoc connection to any database server as needed.');
let welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple query tabs, making it easier to organize your work. You can connect to existing servers or create an ad-hoc connection to any database server as needed.');

if (mode == WORKSPACES.PSQL_TOOL) {
welcomeIcon = <TerminalRoundedIcon style={{height: '2rem', width: 'unset'}} />;
welcomeTitle = gettext('Welcome to the PSQL Workspace!');
welcomeFirst = gettext('The PSQL tool allows users to connect to PostgreSQL or EDB Advanced server using the psql command line interface.');
welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple PSQL tabs, making it easier to organize your work. You can select the existing servers or create a completely new ad-hoc connection to any database server as needed.');
welcomeSecond = gettext('In this workspace, you can seamlessly open and manage multiple PSQL tabs, making it easier to organize your work. You can connect to existing servers or create an ad-hoc connection to any database server as needed.');
}

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export async function reloadPgAdmin() {
export function getNoteField(node, subNode, nodeData, note = '') {
// Check and add the note for the element.
if (subNode.label === gettext('Nodes') && node.label === gettext('Browser')) {
note = gettext('This settings is to Show/Hide nodes in the object explorer.');
note = gettext('This setting is used to show/hide nodes in the Object Explorer.');
}

if (note.length > 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function RightPreference({ schema, filteredItemIds, selectedItem,
return (
<Box className='PreferencesComponent-preferencesContainer'>
<Box className='PreferencesComponent-noSelection'>
<Box>{gettext('Navigate to any below item to view or edit its preferences.')}</Box>
<Box>{gettext('Select an item below to view or edit its preferences.')}</Box>
{selectedItem.children.map((child) => (
<Box key={child.id}>
<Link component='button' onClick={()=>setSelectedItem(child)} underline="hover">{child.name}</Link>
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/static/js/Dialogs/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export function checkMasterPassword(data, masterpass_callback_queue, cancel_call
if(isKeyring) {
if(error){
pgAdmin.Browser.notifier.alert(gettext('Migration failed'),
gettext(`Passwords previously saved can not be re-encrypted using encryption key stored in the ${res.data.data.keyring_name}. due to ${error}`));
gettext(`Passwords previously saved cannot be re-encrypted using the encryption key stored in the ${res.data.data.keyring_name} due to ${error}.`));
}else{
pgAdmin.Browser.notifier.alert(gettext('Migration successful'),
gettext(`Passwords previously saved are re-encrypted using encryption key stored in the ${res.data.data.keyring_name}.`));
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/static/js/Explain/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ function parsePlanData(data, ctx) {
}

export default function Explain({plans=[],
emptyMessage=gettext('Use Explain/Explain analyze button to generate the plan for a query. Alternatively, you can also execute "EXPLAIN (FORMAT JSON) [QUERY]".')
emptyMessage=gettext('Use the Explain/Explain Analyze button to generate the plan for a query. Alternatively, you can also execute "EXPLAIN (FORMAT JSON) [QUERY]".')
}) {

const [tabValue, setTabValue] = React.useState(0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const createFieldControls = ({

if (field.isFullTab) {
if (field.type === inlineGroup)
throw new Error('Inline group can not be full tab control');
throw new Error('Inline group cannot be a full tab control.');

const { visible } = schemaState.options(accessPath.concat(field.id));
currentGroup = createGroup(
Expand Down Expand Up @@ -107,11 +107,11 @@ export const createFieldControls = ({

if (field.type === inlineGroup) {
if (inlineGroupId) {
throw new Error('inline-group can not be created within inline-group');
throw new Error('An inline-group cannot be created within an inline-group.');
}
inlineGroup = currentGroup.inlineGroups[inlineGroupId];
if (inlineGroup) {
throw new Error('inline-group must be unique-id within a tab group');
throw new Error('An inline-group must have a unique ID within a tab group.');
}
inlineGroup = currentGroup.inlineGroups[inlineGroupId] = {
control: View('InlineView'),
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function ForgotPasswordPage({csrfToken, actionUrl, ...props}) {
};

return (
<BasePage title={gettext('Forget Password')} pageImage={<ForgotPasswordImage style={{height: '100%', width: '100%'}} />} {...props} >
<BasePage title={gettext('Forgot Password')} pageImage={<ForgotPasswordImage style={{height: '100%', width: '100%'}} />} {...props} >
<form style={{display:'flex', gap:'15px', flexDirection:'column'}} action={actionUrl} method="POST">
<input name="csrf_token" defaultValue={csrfToken} hidden/>
<div>{gettext('Enter the email address for the user account you wish to recover the password for:')}</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
.catch(() => {
pgAdmin.Browser.notifier.alert(
gettext('Debugger Error'),
gettext('Unable to fetch the arguments from server')
gettext('Unable to fetch the arguments from the server.')
);
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panelId,
messages(transId);
} else if (res.data.data.status === 'NotConnected') {
pgAdmin.Browser.notifier.alert(
gettext('Not connected to server or connection with the server has been closed.'),
gettext('Not connected to the server or the connection to the server has been closed.'),
res.data.result
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -647,9 +647,9 @@ export default class ERDTool extends React.Component {

onDeleteNode() {
pgAdmin.Browser.notifier.confirmDelete(
gettext('Delete ?'),
gettext('Delete?'),
gettext('You have selected %s tables and %s links.', this.diagram.getSelectedNodes().length, this.diagram.getSelectedLinks().length)
+ '<br />' + gettext('Are you sure you want to delete ?'),
+ '<br />' + gettext('Are you sure you want to delete?'),
() => {
this.diagram.getSelectedNodes().forEach((node)=>{
this.diagram.removeNode(node);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default function ImportExportServers({onClose}) {
pgAdmin.Browser.notifier.alert(gettext('Import Servers'), msg);
})
.catch((err) => {
pgAdmin.Browser.notifier.alert(gettext('Import error'), err.response.data.errormsg);
pgAdmin.Browser.notifier.alert(gettext('Import Error'), err.response.data.errormsg);
});
}

Expand Down
4 changes: 2 additions & 2 deletions web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function psql_terminal_io(term, socket, platform, pgAdmin) {
if(result.state === 'granted' || result.state === 'prompt') {
copyToClipboard(selected_text);
} else {
pgAdmin.Browser.notifier.alert(gettext('Clipboard write permission required'), gettext('To copy data from PSQL terminal, Clipboard write permission required.'));
pgAdmin.Browser.notifier.alert(gettext('Clipboard Write Permission Required'), gettext('To copy data from the PSQL terminal, clipboard write permission is required.'));
}
});
} else {
Expand All @@ -106,7 +106,7 @@ function psql_terminal_io(term, socket, platform, pgAdmin) {
}
});
} else{
pgAdmin.Browser.notifier.alert(gettext('Clipboard read permission required'), gettext('To paste data on the PSQL terminal, Clipboard read permission required.'));
pgAdmin.Browser.notifier.alert(gettext('Clipboard Read Permission Required'), gettext('To paste data on the PSQL terminal, clipboard read permission is required.'));
}
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export function Results() {
return (
(<Root>
<Box className='Results-header'>
<span>{gettext('DDL Comparision')}</span>
<span>{gettext('DDL Comparison')}</span>
</Box>
<Box className='Results-labelContainer'>
<Box className='Results-label'>{gettext('Source')}</Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,9 @@ export function SchemaDiffCompare({ params }) {
let generatedScript, scriptHeader;

scriptHeader = gettext('-- This script was generated by the Schema Diff utility in pgAdmin 4. \n');
scriptHeader += gettext('-- For the circular dependencies, the order in which Schema Diff writes the objects is not very sophisticated \n');
scriptHeader += gettext('-- and may require manual changes to the script to ensure changes are applied in the correct order.\n');
scriptHeader += gettext('-- Please report an issue for any failure with the reproduction steps. \n');
scriptHeader += gettext('-- Due to circular dependencies, the order in which Schema Diff writes objects may not be optimal \n');
scriptHeader += gettext('-- and manual changes to the script may be required to ensure changes are applied in the correct order.\n');
scriptHeader += gettext('-- Please report any issues along with steps to reproduce. \n');

if (selectedIds.length > 0) {
let script_array = { 1: [], 2: [], 3: [], 4: [], 5: [] },
Expand Down Expand Up @@ -828,12 +828,12 @@ export function SchemaDiffCompare({ params }) {
:
<Box sx={{ marginTop: '1.2rem',textAlign: 'center'}}>
<InfoRoundedIcon style={{ fontSize: '1.2rem' }} />
{gettext(' Source and Target database server must be of the same major version.')}<br />
<strong>{gettext(' Database Compare:')}</strong>
{gettext(' Select the server and database for the source and target and Click')} <strong>{gettext('Compare.')}</strong>
{' '}{gettext('Source and Target database servers must be of the same major version.')}<br />
<strong>{gettext('Database Compare:')}</strong>
{' '}{gettext('Select the server and database for the source and target and click')} <strong>{gettext('Compare.')}</strong>
<br />
<strong>{gettext('Schema Compare:')}</strong>
{gettext(' Select the server, database and schema for the source and target and Click')} <strong>{gettext('Compare.')}</strong>
{' '}{gettext('Select the server, database and schema for the source and target and click')} <strong>{gettext('Compare.')}</strong>
<br />
<strong>{gettext('Note:')}</strong> {gettext('The dependencies will not be resolved in the Schema comparison.')}
</Box>
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/tools/user_management/static/js/RoleDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function RoleDialog({role, onClose}) {
try {
api.post(url_for('user_management.role_save'), changeData)
.then(()=>{
pgAdmin.Browser.notifier.success(gettext('Role Saved Successfully'));
pgAdmin.Browser.notifier.success(gettext('Role saved successfully.'));
resolve();
onClose(null, true);
})
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/tools/user_management/static/js/Roles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export default function Roles({roles, updateRoles}) {
minSize: 50,
},
{
header: gettext('Decscription'),
header: gettext('Description'),
accessorKey: 'description',
size: 100,
minSize: 100,
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/tools/user_management/static/js/UserDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export default function UserDialog({user, options, onClose}) {
try {
api.post(url_for('user_management.save'), changeData)
.then(()=>{
pgAdmin.Browser.notifier.success(gettext('Users Saved Successfully'));
pgAdmin.Browser.notifier.success(gettext('User saved successfully.'));
resolve();
onClose(null, true);
})
Expand Down
Loading