REMOVE: <%languageselectoptions%>を廃止

AdminActions::parse_languageselectoptions()を削除
管理画面用スキン内の同タグを<%localeselectoptions%>に置き換え

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 98e9e00..16b7806 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -90,7 +90,6 @@ class AdminActions extends BaseActions
                'iprangeinput',
                'itemnavlist',
                'jstoolbaroptions',
-               'languageselectoptions',
                'listplugplugoptionrow',
                'mediadirwarning',
                'movedistselect',
@@ -550,7 +549,6 @@ class AdminActions extends BaseActions
                        case 'editmembersettings':
                                $extra_actions = array(
                                        'editmember',
-                                       'languageselectoptions',
                                        'adminskinselectoptions',
                                        'pluginoptions',
                                );
@@ -670,7 +668,6 @@ class AdminActions extends BaseActions
                                        'defblogselect',
                                        'defskinselect',
                                        'configsettingsedit',
-                                       'languageselectoptions',
                                        'configsettingsyesno',
                                        'outputspecialdirs',
                                        'jstoolbaroptions',
@@ -3955,61 +3952,6 @@ class AdminActions extends BaseActions
                return;
        }
        /**
-        * Parse skinvar languageselectoptions
-        */
-       function parse_languageselectoptions()
-       {
-               $locales = i18n::get_available_locale_list();
-               $memid = intRequestVar('memberid');
-               
-               if ($memid)
-               {
-                       $mem = MEMBER::createFromID($memid);
-                       if ( !$mem->getLocale() || !in_array($mem->getLocale(), $locales) )
-                       {
-                               echo "<option value=\"\" selected=\"selected\">" . ENTITY::hsc(_MEMBERS_USESITELANG) . "</option>\n";
-                       }
-                       else
-                       {
-                               echo "<option value=\"\">" . ENTITY::hsc(_MEMBERS_USESITELANG) . "</option>\n";
-                       }
-               }
-               else
-               {
-                       if ( !i18n::get_current_locale() || !in_array(i18n::get_current_locale(), $locales) )
-                       {
-                               echo "<option value=\"\" selected=\"selected\">en_Latn_US</option>\n";
-                       }
-               }
-               foreach ( $locales as $locale )
-               {
-                       if ($memid)
-                       {
-                               if ( $locale == $mem->getLocale() )
-                               {
-                                       echo "<option value=\"{$locale}\" selected=\"selected\">{$locale}</option>\n";
-                               }
-                               else
-                               {
-                                       echo "<option value=\"{$locale}\">{$locale}</option>\n";
-                               }
-                       }
-                       else
-                       {
-                               if ( $locale == i18n::get_current_locale() )
-                               {
-                                       echo "<option value=\"{$locale}\" selected=\"selected\">{$locale}</option>\n";
-                               }
-                               else
-                               {
-                                       echo "<option value=\"{$locale}\">{$locale}</option>\n";
-                               }
-                       }
-               }
-               return;
-       }
-       
-       /**
         * AdminActions::parse_localeselectoptions()
         * Parse skinvar localeselectoptions
         * 

diff --git a/skins/admin/defaultadmin/skinbackup.xml b/skins/admin/defaultadmin/skinbackup.xml
index 61f8baf..580578b 100644 (file)
--- a/skins/admin/defaultadmin/skinbackup.xml
+++ b/skins/admin/defaultadmin/skinbackup.xml
@@ -1266,7 +1266,7 @@ selector();
                             <td><%text(_MEMBERS_LOCALE)%> <%helplink(locale)%></td>\r
                             <td>\r
                                 <select name="locale" tabindex="85">\r
-                                    <%languageselectoptions%>\r
+                                    <%localeselectoptions%>\r
                                 </select>\r
                             </td>\r
                         </tr><tr>\r
@@ -1855,7 +1855,7 @@ selector();
                         <td><input name="ActionURL" tabindex="10047" size="40" value="<%configsettingsedit(ActionURL)%>" /></td>\r
                     </tr><tr>\r
                         <td><%text(_SETTINGS_LANGUAGE)%> <%helplink(language)%></td>\r
-                        <td><select name="Locale" tabindex="10050"><%languageselectoptions%></select></td>\r
+                        <td><select name="Locale" tabindex="10050"><%localeselectoptions%></select></td>\r
                     </tr><tr>\r
                         <td><%text(_SETTINGS_DISABLESITE)%> <%helplink(disablesite)%></td>\r
                         <td>\r