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

Dashboard: Bug fixes for color panel translation and detail template capitalization #2311

Merged
merged 2 commits into from
Jun 8, 2020
Merged

Dashboard: Bug fixes for color panel translation and detail template capitalization #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5618ea7
use _n not __ for translation of dropdown with numbers
BrittanyIRL Jun 8, 2020
db30d7e
move uppercase to css for detail nav button
BrittanyIRL Jun 8, 2020
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
9 changes: 7 additions & 2 deletions assets/src/dashboard/components/dropdown/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/**
* WordPress dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
import { _n, sprintf } from '@wordpress/i18n';

/**
* External dependencies
Expand Down Expand Up @@ -244,7 +244,12 @@ const Dropdown = ({
{selectedItems.length > 1 &&
sprintf(
/* translators: %s: number selected */
__(' + %s', 'web-stories'),
_n(
' + %s',
' + %s',
(selectedItems.length - 1).toString(10),
'web-stories'
),
(selectedItems.length - 1).toString(10)
)}
</>
Expand Down
9 changes: 6 additions & 3 deletions assets/src/dashboard/components/templateNavBar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ const CloseLink = styled.a`
color: ${theme.colors.gray700};
`}
`;
const CapitalizedButton = styled(Button)`
text-transform: uppercase;
`;

export function TemplateNavBar({ handleCta }) {
return (
Expand All @@ -84,9 +87,9 @@ export function TemplateNavBar({ handleCta }) {
</Container>
<Container>
<BookmarkToggle />
<Button type={BUTTON_TYPES.CTA} onClick={handleCta}>
{__('USE TEMPLATE', 'web-stories')}
</Button>
<CapitalizedButton type={BUTTON_TYPES.CTA} onClick={handleCta}>
{__('use template', 'web-stories')}
</CapitalizedButton>
</Container>
</Nav>
);
Expand Down