Skip to content
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

split upload into verbs and nouns #68227

Merged
merged 6 commits into from
Dec 23, 2024
Merged

split upload into verbs and nouns #68227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
076f4d9
split upload
timse201 Dec 22, 2024
924db02
split upload
timse201 Dec 22, 2024
f0583c3
split upload
timse201 Dec 22, 2024
aa9a361
split upload
timse201 Dec 22, 2024
b544b93
split upload
timse201 Dec 22, 2024
e7a7d4f
Add missing imports for _x function
talldan Dec 23, 2024
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
6 changes: 3 additions & 3 deletions packages/block-editor/src/components/media-placeholder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,
withFilters,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { __, _x } from '@wordpress/i18n';
import { useState, useEffect } from '@wordpress/element';
import { useSelect } from '@wordpress/data';
import { keyboardReturn } from '@wordpress/icons';
Expand Down Expand Up @@ -482,7 +482,7 @@ export function MediaPlaceholder( {
) }
onClick={ openFileDialog }
>
{ __( 'Upload' ) }
{ _x( 'Upload', 'verb' ) }
</Button>
{ uploadMediaLibraryButton }
{ renderUrlSelectionUI() }
Expand Down Expand Up @@ -512,7 +512,7 @@ export function MediaPlaceholder( {
'block-editor-media-placeholder__upload-button'
) }
>
{ __( 'Upload' ) }
{ _x( 'Upload', 'verb' ) }
</Button>
) }
onChange={ onUpload }
Expand Down
4 changes: 2 additions & 2 deletions packages/block-editor/src/components/media-replace-flow/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import clsx from 'clsx';
* WordPress dependencies
*/
import { useRef } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import { __, _x } from '@wordpress/i18n';
import { speak } from '@wordpress/a11y';
import {
FormFileUpload,
Expand Down Expand Up @@ -188,7 +188,7 @@ const MediaReplaceFlow = ( {
openFileDialog();
} }
>
{ __( 'Upload' ) }
{ _x( 'Upload', 'verb' ) }
</MenuItem>
);
} }
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/video/tracks-editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export default function TracksEditor( { tracks = [], onChange } ) {
openFileDialog();
} }
>
{ __( 'Upload' ) }
{ _x( 'Upload', 'verb' ) }
</MenuItem>
);
} }
Expand Down
2 changes: 1 addition & 1 deletion packages/edit-site/src/components/global-styles/font-library-modal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const DEFAULT_TAB = {

const UPLOAD_TAB = {
id: 'upload-fonts',
title: __( 'Upload' ),
title: _x( 'Upload', 'noun' ),
};

const tabsFromCollections = ( collections ) =>
Expand Down
4 changes: 2 additions & 2 deletions packages/editor/src/components/post-publish-panel/maybe-upload-media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
__unstableAnimatePresence as AnimatePresence,
} from '@wordpress/components';
import { useSelect, useDispatch } from '@wordpress/data';
import { __ } from '@wordpress/i18n';
import { __, _x } from '@wordpress/i18n';
import { store as blockEditorStore } from '@wordpress/block-editor';
import { useState } from '@wordpress/element';
import { isBlobURL } from '@wordpress/blob';
Expand Down Expand Up @@ -260,7 +260,7 @@ export default function MaybeUploadMediaPanel() {
variant="primary"
onClick={ uploadImages }
>
{ __( 'Upload' ) }
{ _x( 'Upload', 'verb' ) }
</Button>
) }
</div>
Expand Down
Loading