From 3a48f765580e36b1a0e344cea78b53ef4b5b3886 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Tue, 10 Jun 2014 19:58:53 +0200 Subject: [ticket/12563] Changes 2 language variables to better understandable names PHPBB3-12563 --- phpBB/includes/acp/acp_styles.php | 4 ++-- phpBB/language/en/acp/styles.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 3d0d27e8c9..b2160ef015 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -209,8 +209,8 @@ class acp_styles trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); } $message = implode('
', $messages); - $message .= '

' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_STYLES'], $this->u_base_action . '&mode=style'); - $message .= '

' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED'], $this->u_base_action . '&mode=install'); + $message .= '

' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_INSTALLED_STYLES'], $this->u_base_action . '&mode=style'); + $message .= '

' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'], $this->u_base_action . '&mode=install'); trigger_error($message, E_USER_NOTICE); } diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index c2a3f777c2..00ab943d5f 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -71,8 +71,8 @@ $lang = array_merge($lang, array( 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', 'STYLE_INSTALLED' => 'Style "%s" has been installed.', - 'STYLE_INSTALLED_RETURN_STYLES' => 'Click here to return to installed styles list.', - 'STYLE_INSTALLED_RETURN_UNINSTALLED' => 'Click here to install more styles.', + 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Click here to return to installed styles list.', + 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Click here to install more styles.', 'STYLE_NAME' => 'Style name', 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', 'STYLE_PATH' => 'Style path', -- cgit v1.2.1 From 453cb709635465cc76497fae8f5bafc002463415 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Thu, 12 Jun 2014 19:19:46 +0200 Subject: [ticket/12563] Removes strintf in acp_styles.php and shorts up PHPBB3-12563 --- phpBB/includes/acp/acp_styles.php | 4 ++-- phpBB/language/en/acp/styles.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index b2160ef015..8bd13933c3 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -209,8 +209,8 @@ class acp_styles trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); } $message = implode('
', $messages); - $message .= '

' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_INSTALLED_STYLES'], $this->u_base_action . '&mode=style'); - $message .= '

' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES'], $this->u_base_action . '&mode=install'); + $message .= '

' . $this->user->lang('STYLE_INSTALLED_RETURN_INSTALLED_STYLES', $this->u_base_action . '&mode=style'); + $message .= '

' . $this->user->lang('STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES', $this->u_base_action . '&mode=install'); trigger_error($message, E_USER_NOTICE); } diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 00ab943d5f..65eb002f1a 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -71,8 +71,8 @@ $lang = array_merge($lang, array( 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', 'STYLE_INSTALLED' => 'Style "%s" has been installed.', - 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Click here to return to installed styles list.', - 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Click here to install more styles.', + 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list.', + 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles.', 'STYLE_NAME' => 'Style name', 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', 'STYLE_PATH' => 'Style path', -- cgit v1.2.1 From ff808b341c52c70f22e26d766dd248dac2e98f3d Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 14 Jun 2014 14:31:12 +0200 Subject: [ticket/12563] Removes ending . from PHPBB3-12563 --- phpBB/language/en/acp/styles.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB') diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 65eb002f1a..f46e32ec0d 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -71,8 +71,8 @@ $lang = array_merge($lang, array( 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', 'STYLE_INSTALLED' => 'Style "%s" has been installed.', - 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list.', - 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles.', + 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list', + 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles', 'STYLE_NAME' => 'Style name', 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', 'STYLE_PATH' => 'Style path', -- cgit v1.2.1 From c4e48ed0b962711d77adc8e5f3853350dc7c8ce0 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sun, 22 Jun 2014 21:42:59 +0200 Subject: [ticket/12563] Adds « and » to the links in acp_styles.php PHPBB3-12563 --- phpBB/includes/acp/acp_styles.php | 4 ++-- phpBB/language/en/acp/styles.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 8bd13933c3..4cc93e5670 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -209,8 +209,8 @@ class acp_styles trigger_error($this->user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); } $message = implode('
', $messages); - $message .= '

' . $this->user->lang('STYLE_INSTALLED_RETURN_INSTALLED_STYLES', $this->u_base_action . '&mode=style'); - $message .= '

' . $this->user->lang('STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES', $this->u_base_action . '&mode=install'); + $message .= '

« ' . $this->user->lang('STYLE_INSTALLED_RETURN_INSTALLED_STYLES') . ''; + $message .= '

» ' . $this->user->lang('STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES') . ''; trigger_error($message, E_USER_NOTICE); } diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index f46e32ec0d..506d569d56 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -71,8 +71,8 @@ $lang = array_merge($lang, array( 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', 'STYLE_INSTALLED' => 'Style "%s" has been installed.', - 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list', - 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles', + 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list', + 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles', 'STYLE_NAME' => 'Style name', 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', 'STYLE_PATH' => 'Style path', -- cgit v1.2.1