reconstruct the description for more flexible translations

diff --git a/mod/settings.php b/mod/settings.php
index 1bca4f57ae447ce3d3daf8b451bc6bcd420695ff..4c37247c63fe040adf2021f1ea2b7ca8692eef37 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1103,14 +1103,12 @@ function settings_content(&$a) {
                info( t('Profile is <strong>not published</strong>.') . EOL );
 
 
-       $subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl(true) . '/profile/' . $nickname : '');
+       //$subdir = ((strlen($a->get_path())) ? '<br />' . 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 <strong>'%s'</strong> 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 a8ef0c7e9c40b847797b7fb5fcabe5cc896f25db..8decc2dd4fc6a2ea0eb9f2361b58dd1948135faa 100644 (file)
--- a/view/templates/settings_nick_set.tpl
+++ b/view/templates/settings_nick_set.tpl
@@ -1,6 +1,6 @@
 
 
 <div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message"> {{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}} {{$or}} 'http(s)://{{$basepath}}/profile/{{$nickname}}'</div>
+<div id="settings-nickname-desc" class="info-message">{{$desc}}</div>
 </div>
 <div id="settings-nick-end" ></div>