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
10 changes: 5 additions & 5 deletions cli/commands/site/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ export async function runCommand( siteFolder: string, format: 'table' | 'json' )
}[] = [
{ key: __( 'Site URL' ), value: new URL( siteUrl ).toString(), type: 'url' },
{
key: __( 'Auto Login URL' ),
key: __( 'Auto-login URL' ),
value: autoLoginUrl.toString(),
type: 'url',
hidden: ! isOnline,
},
{ key: __( 'Site Path' ), value: sitePath },
{ key: __( 'Status' ), value: status },
{ key: __( 'PHP Version' ), value: site.phpVersion },
{ key: __( 'WP Version' ), value: wpVersion },
{ key: __( 'Admin Username' ), value: 'admin' },
{ key: __( 'Admin Password' ), value: site.adminPassword },
{ key: __( 'PHP version' ), value: site.phpVersion },
{ key: __( 'WP version' ), value: wpVersion },
{ key: __( 'Admin username' ), value: 'admin' },
{ key: __( 'Admin password' ), value: site.adminPassword },
].filter( ( { value, hidden } ) => value && ! hidden );

if ( format === 'table' ) {
Expand Down
26 changes: 13 additions & 13 deletions cli/commands/site/tests/status.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ describe( 'CLI: studio site status', () => {
'Site URL': 'http://localhost:8080/',
'Site Path': '/path/to/site',
Status: '🔴 Offline',
'PHP Version': '8.0',
'WP Version': '6.4',
'Admin Username': 'admin',
'Admin Password': 'password123',
'PHP version': '8.0',
'WP version': '6.4',
'Admin username': 'admin',
'Admin password': 'password123',
},
null,
2
Expand All @@ -107,13 +107,13 @@ describe( 'CLI: studio site status', () => {
JSON.stringify(
{
'Site URL': 'http://localhost:8080/',
'Auto Login URL': 'http://localhost:8080/studio-auto-login?redirect_to=%2Fwp-admin%2F',
'Auto-login URL': 'http://localhost:8080/studio-auto-login?redirect_to=%2Fwp-admin%2F',
'Site Path': '/path/to/site',
Status: '🟢 Online',
'PHP Version': '8.0',
'WP Version': '6.4',
'Admin Username': 'admin',
'Admin Password': 'password123',
'PHP version': '8.0',
'WP version': '6.4',
'Admin username': 'admin',
'Admin password': 'password123',
},
null,
2
Expand Down Expand Up @@ -154,10 +154,10 @@ describe( 'CLI: studio site status', () => {
'Site URL': 'http://localhost:8080/',
'Site Path': '/path/to/site',
Status: '🔴 Offline',
'PHP Version': undefined,
'WP Version': '6.4',
'Admin Username': 'admin',
'Admin Password': undefined,
'PHP version': undefined,
'WP version': '6.4',
'Admin username': 'admin',
'Admin password': undefined,
},
null,
2
Expand Down
2 changes: 1 addition & 1 deletion src/modules/cli/lib/macos-installation-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class MacOSCliInstallationManager implements StudioCliInstallationManager
const mainWindow = await getMainWindow();
await dialog.showMessageBox( mainWindow, {
type: 'info',
title: __( 'CLI Uninstalled' ),
title: __( 'CLI uninstalled' ),
message: __( 'The CLI has been uninstalled successfully.' ),
} );
} catch ( error ) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/cli/lib/windows-installation-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class WindowsCliInstallationManager implements StudioCliInstallationManag
const mainWindow = await getMainWindow();
await dialog.showMessageBox( mainWindow, {
type: 'info',
title: __( 'CLI Uninstalled' ),
title: __( 'CLI uninstalled' ),
message: __( 'The CLI has been uninstalled successfully.' ),
} );
} catch ( error ) {
Expand Down
2 changes: 2 additions & 0 deletions src/modules/sync/components/sync-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ export function SyncDialog( {
showLabels
valueLabel={ formattedSize }
limitLabel={ formattedLimit }
// translators: %s is a filesize string, e.g. "1.3GB". This label is displayed if a sync
// archive is larger than a given limit.
overLimitLabel={ sprintf( __( '%s over' ), formattedOverAmount ) }
/>
</div>
Expand Down