8000 Fix i18n in JS and PHP by pedro-mendonca · Pull Request #65 · DevinWalker/wp-rollback · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix i18n in JS and PHP #65

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

Merged
merged 2 commits into from
Dec 30, 2023
Merged

Fix i18n in JS and PHP #65

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
1ea63b7
Fix i18n in JS and PHP
pedro-mendonca Dec 29, 2023
a999293
Add missing textdomain
pedro-mendonca Dec 29, 2023
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
5 changes: 3 additions & 2 deletions src/ExpandableText.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Dashicon} from '@wordpress/components';
import {useState} from '@wordpress/element';
import { __ } from '@wordpress/i18n';

const ExpandableText = ({ text }) => {
const [isExpanded, setIsExpanded] = useState(false);
Expand All @@ -21,12 +22,12 @@ const ExpandableText = ({ text }) => {
{isExpanded ? (
<span>
<Dashicon icon={'arrow-up'} />
{' read less'}
{__( 'Read less', 'wp-rollback' )}
</span>
) : (
<span>
<Dashicon icon={'arrow-down'} />
{' read more'}
{__( 'Read more', 'wp-rollback' )}
</span>
)}
</span>
Expand Down
26 changes: 17 additions & 9 deletions src/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import './admin.scss';
import { Button, Dashicon, Modal, Spinner } from '@wordpress/components';
import { render, useEffect, useState } from '@wordpress/element';
import { __, sprintf } from '@wordpress/i18n';
import { __, _n, sprintf } from '@wordpress/i18n';
import domReady from '@wordpress/dom-ready';
import { decodeEntities } from '@wordpress/html-entities';
import { getQueryArgs } from '@wordpress/url';
Expand Down Expand Up @@ -118,17 +118,23 @@ const AdminPage = () => {
const diffInSeconds = Math.floor( ( now - date ) / 1000 );

if ( diffInSeconds < 60 ) {
return `${diffInSeconds} seconds ago`;
// translators: %s Number of seconds.
return sprintf( _n( '%s second ago', '%s seconds ago', diffInSeconds, 'wp-rollback' ), diffInSeconds );
} else if ( diffInSeconds < 3600 ) {
return `${Math.floor( diffInSeconds / 60 )} minutes ago`;
// translators: %s Number of minutes.
return sprintf( _n( '%s minute ago', '%s minutes ago', Math.floor( diffInSeconds / 60 ), 'wp-rollback' ), Math.floor( diffInSeconds / 60 ) );
} else if ( diffInSeconds < 86400 ) {
return `${Math.floor( diffInSeconds / 3600 )} hours ago`;
// translators: %s Number of hours.
return sprintf( _n( '%s hour ago', '%s hours ago', Math.floor( diffInSeconds / 3600 ), 'wp-rollback' ), Math.floor( diffInSeconds / 3600 ) );
} else if ( diffInSeconds < 2592000 ) { // 30 days
return `${Math.floor( diffInSeconds / 86400 )} days ago`;
// translators: %s Number of days.
return sprintf( _n( '%s day ago', '%s days ago', Math.floor( diffInSeconds / 86400 ), 'wp-rollback' ), Math.floor( diffInSeconds / 86400 ) );
} else if ( diffInSeconds < 31536000 ) { // 365 days
return `${Math.floor( diffInSeconds / 2592000 )} months ago`;
// translators: %s Number of monthes.
return sprintf( _n( '%s month ago', '%s months ago', Math.floor( diffInSeconds / 2592000 ), 'wp-rollback' ), Math.floor( diffInSeconds / 2592000 ) );
} else {
return `${Math.floor( diffInSeconds / 31536000 )} years ago`;
// translators: %s Number of years.
return sprintf( _n( '%s year ago', '%s years ago', Math.floor( diffInSeconds / 31536000 ), 'wp-rollback' ), Math.floor( diffInSeconds / 31536000 ) );
}
}

Expand All @@ -143,7 +149,7 @@ const AdminPage = () => {
<a href={'https://wprollback.com/'} target={'_blank'}><img src={wprData.logo} width={250} height={'auto'} alt={'WP Rollback'}/></a>
</div>

<p className={'wpr-intro-text'}>{__( 'Select which version you would like to rollback to from the releases listed below.', '' )}</p>
<p className={'wpr-intro-text'}>{__( 'Select which version you would like to rollback to from the releases listed below.', 'wp-rollback' )}</p>
</div>
<div className="wpr-content-wrap">
{rollbackInfo.banners && queryArgs.type === 'plugin' && ( rollbackInfo.banners.high || rollbackInfo.banners.low ) && (
Expand Down Expand Up @@ -179,6 +185,7 @@ const AdminPage = () => {
{queryArgs.type === 'plugin' && (
<a href={`https://wordpress.org/plugins/${rollbackInfo.slug}/`} target={'_blank'}
className={'wpr-heading-link'}
// translators: %s Plugin or Theme name.
alt={sprintf( __( 'View %s on WordPress.org', 'wp-rollback' ), rollbackInfo.name )}
>
{decodeEntities( rollbackInfo.name )}
Expand All @@ -188,6 +195,7 @@ const AdminPage = () => {
{queryArgs.type === 'theme' && (
<a href={rollbackInfo.homepage} target={'_blank'}
className={'wpr-heading-link'}
// translators: %s Plugin or Theme name.
alt={sprintf( __( 'View %s on WordPress.org', 'wp-rollback' ), rollbackInfo.name )}>
{decodeEntities( rollbackInfo.name )}
<Dashicon icon="external"/>
Expand Down Expand Up @@ -242,7 +250,7 @@ const AdminPage = () => {
<Button isSecondary >
className={'wpr-version-changelog'}>{__( 'View Changelog', 'wp-rollback' )}</Button>
</div>
<h3>Last Updated</h3>
<h3>{__( 'Last Updated', 'wp-rollback' )}</h3>
<div className={'wpr-updater-info'}>
<Dashicon icon="clock"/>
<span
Expand Down
1 change: 1 addition & 0 deletions wp-rollback.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ public function scripts( $hook ): void {
'avatarFallback' => plugins_url( 'src/assets/avatar-plugin-fallback.jpg', __FILE__ ),
'referrer' => wp_get_referer(),
'text_no_changelog_found' => isset( $_GET['plugin_slug'] ) ? sprintf(
// translators: %s Link.
__(
'Sorry, we couldn\'t find a changelog entry found for this version. Try checking the <a href="%s" target="_blank">developer log</a> on WP.org.',
'wp-rollback'
Expand Down
0