Update language keys.

This commit is contained in:
Mike Cao 2020-10-12 22:53:59 -07:00
parent f1624780ee
commit 876c8f7a68
39 changed files with 541 additions and 581 deletions

View file

@ -3,7 +3,7 @@ import Button from './Button';
import { FormattedMessage } from 'react-intl';
const defaultText = (
<FormattedMessage id="button.copy-to-clipboard" defaultMessage="Copy to clipboard" />
<FormattedMessage id="label.copy-to-clipboard" defaultMessage="Copy to clipboard" />
);
export default function CopyButton({ element, ...props }) {

View file

@ -28,7 +28,7 @@ export default function RefreshButton({ websiteId }) {
return (
<Button
icon={loading ? <Dots /> : <Refresh />}
tooltip={<FormattedMessage id="button.refresh" defaultMessage="Refresh" />}
tooltip={<FormattedMessage id="label.refresh" defaultMessage="Refresh" />}
tooltipId="button-refresh"
size="small"
onClick={handleClick}

View file

@ -36,10 +36,10 @@ export default function UpdateNotice() {
</div>
<ButtonLayout>
<Button size="xsmall" variant="action" onClick={handleViewClick}>
<FormattedMessage id="button.view-details" defaultMessage="View details" />
<FormattedMessage id="label.view-details" defaultMessage="View details" />
</Button>
<Button size="xsmall" onClick={handleDismissClick}>
<FormattedMessage id="button.dismiss" defaultMessage="Dismiss" />
<FormattedMessage id="label.dismiss" defaultMessage="Dismiss" />
</Button>
</ButtonLayout>
</div>

View file

@ -70,10 +70,10 @@ export default function AccountEditForm({ values, onSave, onClose }) {
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="button.save" defaultMessage="Save" />
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="button.cancel" defaultMessage="Cancel" />
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>

View file

@ -85,10 +85,10 @@ export default function ChangePasswordForm({ values, onSave, onClose }) {
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="button.save" defaultMessage="Save" />
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="button.cancel" defaultMessage="Cancel" />
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>

View file

@ -33,11 +33,11 @@ export default function DatePickerForm({
const buttons = [
{
label: <FormattedMessage id="button.single-day" defaultMessage="Single day" />,
label: <FormattedMessage id="label.single-day" defaultMessage="Single day" />,
value: FILTER_DAY,
},
{
label: <FormattedMessage id="button.date-range" defaultMessage="Date range" />,
label: <FormattedMessage id="label.date-range" defaultMessage="Date range" />,
value: FILTER_RANGE,
},
];
@ -72,10 +72,10 @@ export default function DatePickerForm({
</div>
<FormButtons>
<Button variant="action" onClick={handleSave} disabled={disabled}>
<FormattedMessage id="button.save" defaultMessage="Save" />
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="button.cancel" defaultMessage="Cancel" />
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
</div>

View file

@ -82,10 +82,10 @@ export default function DeleteForm({ values, onSave, onClose }) {
variant="danger"
disabled={props.values.confirmation !== CONFIRMATION_WORD}
>
<FormattedMessage id="button.delete" defaultMessage="Delete" />
<FormattedMessage id="label.delete" defaultMessage="Delete" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="button.cancel" defaultMessage="Cancel" />
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>

View file

@ -83,7 +83,7 @@ export default function LoginForm() {
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="button.login" defaultMessage="Login" />
<FormattedMessage id="label.login" defaultMessage="Login" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>

View file

@ -30,7 +30,7 @@ export default function TrackingCodeForm({ values, onClose }) {
<FormButtons>
<CopyButton type="submit" variant="action" element={ref} />
<Button onClick={onClose}>
<FormattedMessage id="button.cancel" defaultMessage="Cancel" />
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
</FormLayout>

View file

@ -29,7 +29,7 @@ export default function TrackingCodeForm({ values, onClose }) {
<FormButtons>
<CopyButton type="submit" variant="action" element={ref} />
<Button onClick={onClose}>
<FormattedMessage id="button.cancel" defaultMessage="Cancel" />
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
</FormLayout>

View file

@ -91,10 +91,10 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
</FormRow>
<FormButtons>
<Button type="submit" variant="action">
<FormattedMessage id="button.save" defaultMessage="Save" />
<FormattedMessage id="label.save" defaultMessage="Save" />
</Button>
<Button onClick={onClose}>
<FormattedMessage id="button.cancel" defaultMessage="Cancel" />
<FormattedMessage id="label.cancel" defaultMessage="Cancel" />
</Button>
</FormButtons>
<FormMessage>{message}</FormMessage>

View file

@ -76,7 +76,7 @@ export default function MetricsTable({
size="small"
iconRight
>
<FormattedMessage id="button.more" defaultMessage="More" />
<FormattedMessage id="label.more" defaultMessage="More" />
</Link>
)}
</div>

View file

@ -24,7 +24,7 @@ export default function WebsiteHeader({ websiteId, title, showLink = false }) {
size="small"
iconRight
>
<FormattedMessage id="button.view-details" defaultMessage="View details" />
<FormattedMessage id="label.view-details" defaultMessage="View details" />
</Link>
)}
</ButtonLayout>

View file

@ -56,7 +56,7 @@ export default function WebsiteDetails({ websiteId }) {
icon={<Arrow />}
size="small"
>
<FormattedMessage id="button.back" defaultMessage="Back" />
<FormattedMessage id="label.back" defaultMessage="Back" />
</Link>
</div>
);

View file

@ -42,10 +42,10 @@ export default function AccountSettings() {
row.username !== 'admin' ? (
<ButtonLayout align="right">
<Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>
<FormattedMessage id="button.edit" defaultMessage="Edit" />
<FormattedMessage id="label.edit" defaultMessage="Edit" />
</Button>
<Button icon={<Trash />} size="small" onClick={() => setDeleteAccount(row)}>
<FormattedMessage id="button.delete" defaultMessage="Delete" />
<FormattedMessage id="label.delete" defaultMessage="Delete" />
</Button>
</ButtonLayout>
) : null;
@ -98,12 +98,12 @@ export default function AccountSettings() {
<FormattedMessage id="label.accounts" defaultMessage="Accounts" />
</div>
<Button icon={<Plus />} size="small" onClick={() => setAddAccount(true)}>
<FormattedMessage id="button.add-account" defaultMessage="Add account" />
<FormattedMessage id="label.add-account" defaultMessage="Add account" />
</Button>
</PageHeader>
<Table columns={columns} rows={data} />
{editAccount && (
<Modal title={<FormattedMessage id="title.edit-account" defaultMessage="Edit account" />}>
<Modal title={<FormattedMessage id="label.edit-account" defaultMessage="Edit account" />}>
<AccountEditForm
values={{ ...editAccount, password: '' }}
onSave={handleSave}
@ -112,13 +112,13 @@ export default function AccountSettings() {
</Modal>
)}
{addAccount && (
<Modal title={<FormattedMessage id="title.add-account" defaultMessage="Add account" />}>
<Modal title={<FormattedMessage id="label.add-account" defaultMessage="Add account" />}>
<AccountEditForm onSave={handleSave} onClose={handleClose} />
</Modal>
)}
{deleteAccount && (
<Modal
title={<FormattedMessage id="title.delete-account" defaultMessage="Delete account" />}
title={<FormattedMessage id="label.delete-account" defaultMessage="Delete account" />}
>
<DeleteForm
values={{ type: 'account', id: deleteAccount.user_id, name: deleteAccount.username }}

View file

@ -19,7 +19,7 @@ export default function DateRangeSetting() {
<>
<DateFilter value={value} startDate={startDate} endDate={endDate} onChange={setDateRange} />
<Button className={styles.button} size="small" onClick={handleReset}>
<FormattedMessage id="button.reset" defaultMessage="Reset" />
<FormattedMessage id="label.reset" defaultMessage="Reset" />
</Button>
</>
);

View file

@ -34,7 +34,7 @@ export default function ProfileSettings() {
<FormattedMessage id="label.profile" defaultMessage="Profile" />
</div>
<Button icon={<Dots />} size="small" onClick={() => setChangePassword(true)}>
<FormattedMessage id="button.change-password" defaultMessage="Change password" />
<FormattedMessage id="label.change-password" defaultMessage="Change password" />
</Button>
</PageHeader>
<dl className={styles.list}>
@ -57,7 +57,7 @@ export default function ProfileSettings() {
</dl>
{changePassword && (
<Modal
title={<FormattedMessage id="title.change-password" defaultMessage="Change password" />}
title={<FormattedMessage id="label.change-password" defaultMessage="Change password" />}
>
<ChangePasswordForm
values={{ user_id }}

View file

@ -24,7 +24,7 @@ export default function TimezoneSetting() {
onChange={saveTimezone}
/>
<Button className={styles.button} size="small" onClick={handleReset}>
<FormattedMessage id="button.reset" defaultMessage="Reset" />
<FormattedMessage id="label.reset" defaultMessage="Reset" />
</Button>
</>
);

View file

@ -52,10 +52,10 @@ export default function WebsiteSettings() {
onClick={() => setShowCode(row)}
/>
<Button icon={<Pen />} size="small" onClick={() => setEditWebsite(row)}>
<FormattedMessage id="button.edit" defaultMessage="Edit" />
<FormattedMessage id="label.edit" defaultMessage="Edit" />
</Button>
<Button icon={<Trash />} size="small" onClick={() => setDeleteWebsite(row)}>
<FormattedMessage id="button.delete" defaultMessage="Delete" />
<FormattedMessage id="label.delete" defaultMessage="Delete" />
</Button>
</ButtonLayout>
);
@ -113,7 +113,7 @@ export default function WebsiteSettings() {
}
>
<Button icon={<Plus />} size="medium" onClick={() => setAddWebsite(true)}>
<FormattedMessage id="button.add-website" defaultMessage="Add website" />
<FormattedMessage id="label.add-website" defaultMessage="Add website" />
</Button>
</EmptyPlaceholder>
);
@ -125,23 +125,23 @@ export default function WebsiteSettings() {
<FormattedMessage id="label.websites" defaultMessage="Websites" />
</div>
<Button icon={<Plus />} size="small" onClick={() => setAddWebsite(true)}>
<FormattedMessage id="button.add-website" defaultMessage="Add website" />
<FormattedMessage id="label.add-website" defaultMessage="Add website" />
</Button>
</PageHeader>
<Table columns={columns} rows={data} empty={empty} />
{editWebsite && (
<Modal title={<FormattedMessage id="title.edit-website" defaultMessage="Edit website" />}>
<Modal title={<FormattedMessage id="label.edit-website" defaultMessage="Edit website" />}>
<WebsiteEditForm values={editWebsite} onSave={handleSave} onClose={handleClose} />
</Modal>
)}
{addWebsite && (
<Modal title={<FormattedMessage id="title.add-website" defaultMessage="Add website" />}>
<Modal title={<FormattedMessage id="label.add-website" defaultMessage="Add website" />}>
<WebsiteEditForm onSave={handleSave} onClose={handleClose} />
</Modal>
)}
{deleteWebsite && (
<Modal
title={<FormattedMessage id="title.delete-website" defaultMessage="Delete website" />}
title={<FormattedMessage id="label.delete-website" defaultMessage="Delete website" />}
>
<DeleteForm
values={{ type: 'website', id: deleteWebsite.website_id, name: deleteWebsite.name }}
@ -151,12 +151,12 @@ export default function WebsiteSettings() {
</Modal>
)}
{showCode && (
<Modal title={<FormattedMessage id="title.tracking-code" defaultMessage="Tracking code" />}>
<Modal title={<FormattedMessage id="label.tracking-code" defaultMessage="Tracking code" />}>
<TrackingCodeForm values={showCode} onClose={handleClose} />
</Modal>
)}
{showUrl && (
<Modal title={<FormattedMessage id="title.share-url" defaultMessage="Share URL" />}>
<Modal title={<FormattedMessage id="label.share-url" defaultMessage="Share URL" />}>
<ShareUrlForm values={showUrl} onClose={handleClose} />
</Modal>
)}