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

Merge back to release branch #1103

Merged
merged 12 commits into from
May 7, 2024
Merged

Merge back to release branch #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8917689
Update posts-teaser-promo.php
DAnn2012 May 4, 2024
ee120ad
Update visibility-statuses-promo.php
DAnn2012 May 4, 2024
cda14dd
Update statuses-promo.php
DAnn2012 May 4, 2024
1672ab2
Update sync-promo.php
DAnn2012 May 4, 2024
1486811
Update AgentPermissionsUI.php
DAnn2012 May 4, 2024
105c2e3
Update Groups.php
DAnn2012 May 4, 2024
a796d73
Update AgentPermissions.php
DAnn2012 May 4, 2024
91f9638
Update GroupsListTable.php
DAnn2012 May 4, 2024
e50453c
Update CoreAdmin.php
DAnn2012 May 7, 2024
979f554
Merge pull request #1102 from publishpress/release-4.0.23
agapetry May 7, 2024
4fd3988
Merge pull request #1091 from DAnn2012/patch-2
agapetry May 7, 2024
943f619
Merge pull request #1089 from DAnn2012/patch-1
agapetry May 7, 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
2 changes: 1 addition & 1 deletion classes/PublishPress/Permissions/UI/AgentPermissions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function __construct() {
$_url = add_query_arg(['agent_type' => $agent_type], $_url);
}
?>
<a href="<?php echo esc_url($_url);?>" class="page-title-action"><?php esc_html_e('Add New');?></a>
<a href="<?php echo esc_url($_url);?>" class="page-title-action"><?php esc_html_e('Add New', 'press-permit-core');?></a>
<?php endif;?>

</header>
Expand Down
2 changes: 1 addition & 1 deletion classes/PublishPress/Permissions/UI/AgentPermissionsUI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ private static function selectCloneUI($agent)

<br />
<div>
<input id="pp_clone_permissions" class="button button-primary pp-primary-button" type="submit" name="pp_clone_permissions" value="<?php esc_attr_e('Do Clone'); ?>">
<input id="pp_clone_permissions" class="button button-primary pp-primary-button" type="submit" name="pp_clone_permissions" value="<?php esc_attr_e('Do Clone', 'press-permit-core'); ?>">
</div>
<?php
}
Expand Down
2 changes: 1 addition & 1 deletion classes/PublishPress/Permissions/UI/Groups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function __construct() {
$_url = add_query_arg(['agent_type' => $agent_type], $_url);
}
?>
<a href="<?php echo esc_url($_url);?>" class="page-title-action"><?php esc_html_e('Add New');?></a>
<a href="<?php echo esc_url($_url);?>" class="page-title-action"><?php esc_html_e('Add New', 'press-permit-core');?></a>
<?php endif;

if ($pp->getOption('display_hints')) {
Expand Down
2 changes: 1 addition & 1 deletion classes/PublishPress/Permissions/UI/GroupsListTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public function single_row($group)
esc_html_e('Login State', 'press-permit-core');
break;
default:
esc_html_e('WordPress Role');
esc_html_e('WordPress Role', 'press-permit-core');
}

break;
Expand Down
2 changes: 1 addition & 1 deletion includes/CoreAdmin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function __construct() {

add_filter(\PPVersionNotices\Module\TopNotice\Module::SETTINGS_FILTER, function ($settings) {
$settings['press-permit-core'] = [
'message' => 'You\'re using PublishPress Permissions Free. The Pro version has more features and support. %sUpgrade to Pro%s',
'message' => esc_html__("You're using PublishPress Permissions Free. The Pro version has more features and support. %sUpgrade to Pro%s", 'press-permit-core'),
'link' => 'https://publishpress.com/links/permissions-banner',
'screens' => [
['base' => 'toplevel_page_presspermit-groups'],
Expand Down
2 changes: 1 addition & 1 deletion includes/promo/posts-teaser-promo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</p>
<p>
<a href="https://publishpress.com/links/permissions-teaser-screen" target="_blank">
<?php esc_html_e('Upgrade to Pro', 'capsman-enhanced'); ?>
<?php esc_html_e('Upgrade to Pro', 'press-permit-core'); ?>
</a>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion includes/promo/statuses-promo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</p>
<p>
<a href="https://publishpress.com/links/permissions-statuses-screen" target="_blank">
<?php esc_html_e('Upgrade to Pro', 'capsman-enhanced'); ?>
<?php esc_html_e('Upgrade to Pro', 'press-permit-core'); ?>
</a>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion includes/promo/sync-promo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</p>
<p>
<a href="https://publishpress.com/links/permissions-sync-screen" target="_blank">
<?php esc_html_e('Upgrade to Pro', 'capsman-enhanced'); ?>
<?php esc_html_e('Upgrade to Pro', 'press-permit-core'); ?>
</a>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion includes/promo/visibility-statuses-promo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</p>
<p>
<a href="https://publishpress.com/links/permissions-statuses-screen" target="_blank">
<?php esc_html_e('Upgrade to Pro', 'capsman-enhanced'); ?>
<?php esc_html_e('Upgrade to Pro', 'press-permit-core'); ?>
</a>
</p>
</div>
Expand Down