[Rt-commit] rt branch, 4.4/show-system-default-values, created. rt-4.4.3-143-geb864402e6

? sunnavy sunnavy at bestpractical.com
Thu Dec 20 13:13:24 EST 2018


The branch, 4.4/show-system-default-values has been created
        at  eb864402e670dd44d710ef313c47488113251436 (commit)

- Log -----------------------------------------------------------------
commit e4399e7168c7ab9875ad4784dcb647731b3553f9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Dec 21 01:49:25 2018 +0800

    Show system default value for Timezone
    
    "System Default" without a value is not useful to users.

diff --git a/share/html/Elements/SelectTimezone b/share/html/Elements/SelectTimezone
index 1ade6d4d99..f373bbd72b 100644
--- a/share/html/Elements/SelectTimezone
+++ b/share/html/Elements/SelectTimezone
@@ -60,7 +60,7 @@ for ( @names ) {
 </%ONCE>
 <select name="<% $Name %>">
 % if ( $ShowNullOption ) {
-<option value=""><&|/l&>System Default</&></option>
+<option value=""><&|/l&>System Default</&> (<% RT->Config->Get('Timezone') %>)</option>
 % }
 % foreach my $tz (@names) {
 <option value="<% $tz %>" <% ($Default||'') eq $tz? 'selected="selected"' :''
diff --git a/share/html/Prefs/Elements/ShowAboutMe b/share/html/Prefs/Elements/ShowAboutMe
index 268eb3a5a4..0ce0aac115 100644
--- a/share/html/Prefs/Elements/ShowAboutMe
+++ b/share/html/Prefs/Elements/ShowAboutMe
@@ -77,7 +77,7 @@
 % if ( $UserObj->Timezone ) {
           <td class="value"><%$UserObj->Timezone%></td>
 % } else {
-          <td class="value"><&|/l&>System Default</&></td>
+          <td class="value"><&|/l&>System Default</&> (<% RT->Config->Get('Timezone') %>)</td>
 % }
         </tr>
       <& /Elements/ShowCustomFields, Object => $UserObj, Grouping => 'Identity', InTable => 1 &>

commit eb864402e670dd44d710ef313c47488113251436
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Dec 21 01:49:38 2018 +0800

    Show system default value for Lang
    
    "-" or "System Default" without a value is not useful to users.

diff --git a/share/html/Elements/SelectLang b/share/html/Elements/SelectLang
index e21eaf1bd8..9458a758ae 100644
--- a/share/html/Elements/SelectLang
+++ b/share/html/Elements/SelectLang
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 % if ($ShowNullOption) {
-<option value="">-</option>
+<option value="">- (<% I18N::LangTags::List::name($session{CurrentUser}->LanguageHandle->language_tag) %>)</option>
 % }
 % foreach my $lang (@lang) {
 <option value="<%$lang%>"<%(defined($Default) && ($lang eq $Default)) && qq[ selected="selected"] |n%>><% $lang_to_desc{$lang} %>
diff --git a/share/html/Prefs/Elements/ShowAboutMe b/share/html/Prefs/Elements/ShowAboutMe
index 0ce0aac115..6312417de0 100644
--- a/share/html/Prefs/Elements/ShowAboutMe
+++ b/share/html/Prefs/Elements/ShowAboutMe
@@ -69,7 +69,7 @@
 % if ( $UserObj->Lang ) {
           <td class="value"><&|/l, $lang &>[_1]</&></td>
 % } else {
-          <td class="value"><&|/l&>System Default</&></td>
+          <td class="value"><&|/l&>System Default</&> (<% I18N::LangTags::List::name($session{CurrentUser}->LanguageHandle->language_tag) %>)</td>
 % }
         </tr>
         <tr>

-----------------------------------------------------------------------


More information about the rt-commit mailing list