diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-06-23 22:07:15 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-06-23 22:07:15 +0530 |
| commit | 6be8c982960ce8200d88d241a6ecf66ea45d91a9 (patch) | |
| tree | 1b1beaa49b314403850639d065144f84c8a9c769 | |
| parent | 9f91e8e9bd907b15d7417a0994cf1040a1bd3985 (diff) | |
| parent | dfbe072d5132ff3110131cf219826cdd26ddd4b1 (diff) | |
| download | forums-6be8c982960ce8200d88d241a6ecf66ea45d91a9.tar forums-6be8c982960ce8200d88d241a6ecf66ea45d91a9.tar.gz forums-6be8c982960ce8200d88d241a6ecf66ea45d91a9.tar.bz2 forums-6be8c982960ce8200d88d241a6ecf66ea45d91a9.tar.xz forums-6be8c982960ce8200d88d241a6ecf66ea45d91a9.zip | |
Merge branch 'develop-ascraeus' into develop
# By Crizzo
# Via Crizzo (1) and Dhruv Goel (1)
* develop-ascraeus:
[ticket/12563] Adds « and » to the links in acp_styles.php
[ticket/12563] Removes ending . from <a>
[ticket/12563] Removes strintf in acp_styles.php and shorts up <a>
[ticket/12563] Changes 2 language variables to better understandable names
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 3d0d27e8c9..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('<br />', $messages); - $message .= '<br /><br />' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_STYLES'], $this->u_base_action . '&mode=style'); - $message .= '<br /><br />' . sprintf($this->user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED'], $this->u_base_action . '&mode=install'); + $message .= '<br /><br /><a href="' . $this->u_base_action . '&mode=style' . '">« ' . $this->user->lang('STYLE_INSTALLED_RETURN_INSTALLED_STYLES') . '</a>'; + $message .= '<br /><br /><a href="' . $this->u_base_action . '&mode=install' . '">» ' . $this->user->lang('STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES') . '</a>'; trigger_error($message, E_USER_NOTICE); } diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index c2a3f777c2..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_STYLES' => '<a href="%s">Click here</a> to return to installed styles list.', - 'STYLE_INSTALLED_RETURN_UNINSTALLED' => '<a href="%s">Click here</a> 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', |