From 621dec16062a3f536658863c734847dd2ab20253 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 17 Aug 2015 07:20:50 +0200 Subject: [PATCH] reconstruct the description for more flexible translations --- mod/settings.php | 6 ++---- view/templates/settings_nick_set.tpl | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 1bca4f57a..4c37247c6 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1103,14 +1103,12 @@ function settings_content(&$a) { info( t('Profile is not published.') . EOL ); - $subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : ''); + //$subdir = ((strlen($a->get_path())) ? '
' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : ''); $tpl_addr = get_markup_template("settings_nick_set.tpl"); $prof_addr = replace_macros($tpl_addr,array( - '$desc' => t('Your Identity Address is'), - '$nickname' => $nickname, - '$subdir' => $subdir, + '$desc' => sprintf(t("Your Identity Address is '%s' or '%s'."), $nickname.'@'.$a->get_hostname(), $a->get_baseurl().'/profile/'.$nickname), '$or' => t('or'), '$basepath' => $a->get_hostname() )); diff --git a/view/templates/settings_nick_set.tpl b/view/templates/settings_nick_set.tpl index a8ef0c7e9..8decc2dd4 100644 --- a/view/templates/settings_nick_set.tpl +++ b/view/templates/settings_nick_set.tpl @@ -1,6 +1,6 @@
-
{{$desc}} '{{$nickname}}@{{$basepath}}'{{$subdir}} {{$or}} 'http(s)://{{$basepath}}/profile/{{$nickname}}'
+
{{$desc}}