mirror of
https://ghproxy.net/https://github.com/abhijitb/helix.git
synced 2025-08-28 03:30:13 +08:00
fixed language and timezone drop down
This commit is contained in:
parent
c29c823d56
commit
116a05f1b5
3 changed files with 224 additions and 14 deletions
|
@ -277,6 +277,166 @@ function helix_sanitize_setting_value( $setting, $value ) {
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
* @return array Settings configuration array.
|
* @return array Settings configuration array.
|
||||||
*/
|
*/
|
||||||
|
/**
|
||||||
|
* Get available WordPress languages.
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
* @return array Array of available languages.
|
||||||
|
*/
|
||||||
|
function helix_get_available_languages() {
|
||||||
|
$language_options = array();
|
||||||
|
|
||||||
|
// Add English (United States) as default
|
||||||
|
$language_options[] = array(
|
||||||
|
'value' => '',
|
||||||
|
'label' => 'English (United States)'
|
||||||
|
);
|
||||||
|
|
||||||
|
// Try to get installed languages
|
||||||
|
if ( function_exists( 'get_available_languages' ) || ( file_exists( ABSPATH . 'wp-admin/includes/translation-install.php' ) && require_once ABSPATH . 'wp-admin/includes/translation-install.php' ) ) {
|
||||||
|
|
||||||
|
$languages = get_available_languages();
|
||||||
|
|
||||||
|
if ( ! empty( $languages ) && function_exists( 'wp_get_available_translations' ) ) {
|
||||||
|
$available_translations = wp_get_available_translations();
|
||||||
|
|
||||||
|
foreach ( $languages as $language ) {
|
||||||
|
$language_data = $available_translations[ $language ] ?? null;
|
||||||
|
if ( $language_data && isset( $language_data['native_name'] ) ) {
|
||||||
|
$language_options[] = array(
|
||||||
|
'value' => $language,
|
||||||
|
'label' => $language_data['native_name']
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Fallback if translation data is not available
|
||||||
|
$language_options[] = array(
|
||||||
|
'value' => $language,
|
||||||
|
'label' => $language
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no languages found, add some common ones as fallback
|
||||||
|
if ( count( $language_options ) === 1 ) {
|
||||||
|
$common_languages = array(
|
||||||
|
'es_ES' => 'Español',
|
||||||
|
'fr_FR' => 'Français',
|
||||||
|
'de_DE' => 'Deutsch',
|
||||||
|
'it_IT' => 'Italiano',
|
||||||
|
'pt_BR' => 'Português do Brasil',
|
||||||
|
'ru_RU' => 'Русский',
|
||||||
|
'ja' => '日本語',
|
||||||
|
'zh_CN' => '简体中文',
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach ( $common_languages as $code => $name ) {
|
||||||
|
$language_options[] = array(
|
||||||
|
'value' => $code,
|
||||||
|
'label' => $name
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $language_options;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get available WordPress timezones.
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
* @return array Array of available timezones.
|
||||||
|
*/
|
||||||
|
function helix_get_available_timezones() {
|
||||||
|
$timezone_options = array();
|
||||||
|
|
||||||
|
// UTC and common UTC offsets
|
||||||
|
$timezone_options[] = array( 'value' => 'UTC', 'label' => 'UTC' );
|
||||||
|
|
||||||
|
// Positive UTC offsets
|
||||||
|
for ( $i = 1; $i <= 12; $i++ ) {
|
||||||
|
$offset = sprintf( '+%d', $i );
|
||||||
|
$timezone_options[] = array( 'value' => "UTC{$offset}", 'label' => "UTC{$offset}" );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Negative UTC offsets
|
||||||
|
for ( $i = 1; $i <= 12; $i++ ) {
|
||||||
|
$offset = sprintf( '-%d', $i );
|
||||||
|
$timezone_options[] = array( 'value' => "UTC{$offset}", 'label' => "UTC{$offset}" );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Major city-based timezones organized by region
|
||||||
|
$timezone_regions = array(
|
||||||
|
'America' => array(
|
||||||
|
'America/New_York' => 'New York',
|
||||||
|
'America/Chicago' => 'Chicago',
|
||||||
|
'America/Denver' => 'Denver',
|
||||||
|
'America/Los_Angeles' => 'Los Angeles',
|
||||||
|
'America/Toronto' => 'Toronto',
|
||||||
|
'America/Vancouver' => 'Vancouver',
|
||||||
|
'America/Montreal' => 'Montreal',
|
||||||
|
'America/Mexico_City' => 'Mexico City',
|
||||||
|
'America/Sao_Paulo' => 'São Paulo',
|
||||||
|
'America/Buenos_Aires' => 'Buenos Aires',
|
||||||
|
),
|
||||||
|
'Europe' => array(
|
||||||
|
'Europe/London' => 'London',
|
||||||
|
'Europe/Paris' => 'Paris',
|
||||||
|
'Europe/Berlin' => 'Berlin',
|
||||||
|
'Europe/Rome' => 'Rome',
|
||||||
|
'Europe/Madrid' => 'Madrid',
|
||||||
|
'Europe/Amsterdam' => 'Amsterdam',
|
||||||
|
'Europe/Brussels' => 'Brussels',
|
||||||
|
'Europe/Vienna' => 'Vienna',
|
||||||
|
'Europe/Stockholm' => 'Stockholm',
|
||||||
|
'Europe/Moscow' => 'Moscow',
|
||||||
|
),
|
||||||
|
'Asia' => array(
|
||||||
|
'Asia/Tokyo' => 'Tokyo',
|
||||||
|
'Asia/Shanghai' => 'Shanghai',
|
||||||
|
'Asia/Hong_Kong' => 'Hong Kong',
|
||||||
|
'Asia/Singapore' => 'Singapore',
|
||||||
|
'Asia/Kolkata' => 'Kolkata',
|
||||||
|
'Asia/Dubai' => 'Dubai',
|
||||||
|
'Asia/Bangkok' => 'Bangkok',
|
||||||
|
'Asia/Seoul' => 'Seoul',
|
||||||
|
'Asia/Manila' => 'Manila',
|
||||||
|
),
|
||||||
|
'Australia' => array(
|
||||||
|
'Australia/Sydney' => 'Sydney',
|
||||||
|
'Australia/Melbourne' => 'Melbourne',
|
||||||
|
'Australia/Brisbane' => 'Brisbane',
|
||||||
|
'Australia/Perth' => 'Perth',
|
||||||
|
'Australia/Adelaide' => 'Adelaide',
|
||||||
|
),
|
||||||
|
'Africa' => array(
|
||||||
|
'Africa/Cairo' => 'Cairo',
|
||||||
|
'Africa/Johannesburg' => 'Johannesburg',
|
||||||
|
'Africa/Lagos' => 'Lagos',
|
||||||
|
),
|
||||||
|
'Pacific' => array(
|
||||||
|
'Pacific/Auckland' => 'Auckland',
|
||||||
|
'Pacific/Honolulu' => 'Honolulu',
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
$timezone_identifiers = timezone_identifiers_list();
|
||||||
|
|
||||||
|
foreach ( $timezone_regions as $region => $timezones ) {
|
||||||
|
foreach ( $timezones as $timezone_id => $city_name ) {
|
||||||
|
if ( in_array( $timezone_id, $timezone_identifiers ) ) {
|
||||||
|
$timezone_options[] = array(
|
||||||
|
'value' => $timezone_id,
|
||||||
|
'label' => "{$city_name} ({$region})"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $timezone_options;
|
||||||
|
}
|
||||||
|
|
||||||
function helix_get_settings_config() {
|
function helix_get_settings_config() {
|
||||||
return array(
|
return array(
|
||||||
'site_information' => array(
|
'site_information' => array(
|
||||||
|
@ -315,12 +475,14 @@ function helix_get_settings_config() {
|
||||||
'description' => __( 'The language for your site.', 'helix' ),
|
'description' => __( 'The language for your site.', 'helix' ),
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => get_locale(),
|
'default' => get_locale(),
|
||||||
|
'enum' => helix_get_available_languages(),
|
||||||
),
|
),
|
||||||
'timezone' => array(
|
'timezone' => array(
|
||||||
'label' => __( 'Timezone', 'helix' ),
|
'label' => __( 'Timezone', 'helix' ),
|
||||||
'description' => __( 'Choose either a city in the same timezone as you or a UTC timezone offset.', 'helix' ),
|
'description' => __( 'Choose either a city in the same timezone as you or a UTC timezone offset.', 'helix' ),
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
'default' => get_option( 'timezone_string', 'UTC' ),
|
'default' => get_option( 'timezone_string', 'UTC' ),
|
||||||
|
'enum' => helix_get_available_timezones(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
'content_reading' => array(
|
'content_reading' => array(
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import SettingsSection from './SettingsSection';
|
import SettingsSection from './SettingsSection';
|
||||||
import TextInput from '../../../components/TextInput';
|
import TextInput from '../../../components/TextInput';
|
||||||
|
import SelectInput from '../../../components/SelectInput';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Site Information Settings Component
|
* Site Information Settings Component
|
||||||
|
@ -64,20 +65,26 @@ const SiteInformationSettings = ( { settings, updateSetting } ) => {
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<TextInput
|
<SelectInput
|
||||||
label="Site Language"
|
label="Site Language"
|
||||||
description="The language for your site interface."
|
description="The language for your site interface."
|
||||||
value={ settings.language }
|
value={
|
||||||
|
settings.language?.value || settings.language || ''
|
||||||
|
}
|
||||||
onChange={ ( value ) => updateSetting( 'language', value ) }
|
onChange={ ( value ) => updateSetting( 'language', value ) }
|
||||||
placeholder="en_US"
|
options={ settings.language?.options || [] }
|
||||||
|
placeholder="Select a language..."
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<TextInput
|
<SelectInput
|
||||||
label="Timezone"
|
label="Timezone"
|
||||||
description="Choose either a city in the same timezone as you or a UTC timezone offset."
|
description="Choose either a city in the same timezone as you or a UTC timezone offset."
|
||||||
value={ settings.timezone }
|
value={
|
||||||
|
settings.timezone?.value || settings.timezone || ''
|
||||||
|
}
|
||||||
onChange={ ( value ) => updateSetting( 'timezone', value ) }
|
onChange={ ( value ) => updateSetting( 'timezone', value ) }
|
||||||
placeholder="UTC"
|
options={ settings.timezone?.options || [] }
|
||||||
|
placeholder="Select a timezone..."
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</SettingsSection>
|
</SettingsSection>
|
||||||
|
|
|
@ -13,6 +13,17 @@ export const useSettings = () => {
|
||||||
const [ error, setError ] = useState( null );
|
const [ error, setError ] = useState( null );
|
||||||
const [ hasUnsavedChanges, setHasUnsavedChanges ] = useState( false );
|
const [ hasUnsavedChanges, setHasUnsavedChanges ] = useState( false );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the value for comparison from a setting (handles both object and primitive formats)
|
||||||
|
* @param {any} setting - Setting data
|
||||||
|
* @return {any} The value for comparison
|
||||||
|
*/
|
||||||
|
const getSettingValue = ( setting ) => {
|
||||||
|
return setting && typeof setting === 'object' && 'value' in setting
|
||||||
|
? setting.value
|
||||||
|
: setting;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load settings from API
|
* Load settings from API
|
||||||
*/
|
*/
|
||||||
|
@ -27,8 +38,17 @@ export const useSettings = () => {
|
||||||
const flattenedSettings = {};
|
const flattenedSettings = {};
|
||||||
Object.keys( data ).forEach( ( category ) => {
|
Object.keys( data ).forEach( ( category ) => {
|
||||||
Object.keys( data[ category ] ).forEach( ( setting ) => {
|
Object.keys( data[ category ] ).forEach( ( setting ) => {
|
||||||
flattenedSettings[ setting ] =
|
const settingData = data[ category ][ setting ];
|
||||||
data[ category ][ setting ].value;
|
// If setting has options (for dropdowns), keep the full object
|
||||||
|
if (
|
||||||
|
settingData.options &&
|
||||||
|
Array.isArray( settingData.options )
|
||||||
|
) {
|
||||||
|
flattenedSettings[ setting ] = settingData;
|
||||||
|
} else {
|
||||||
|
// For simple settings, just extract the value
|
||||||
|
flattenedSettings[ setting ] = settingData.value;
|
||||||
|
}
|
||||||
} );
|
} );
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
@ -50,13 +70,28 @@ export const useSettings = () => {
|
||||||
const updateSetting = useCallback(
|
const updateSetting = useCallback(
|
||||||
( key, value ) => {
|
( key, value ) => {
|
||||||
setSettings( ( prev ) => {
|
setSettings( ( prev ) => {
|
||||||
const newSettings = { ...prev, [ key ]: value };
|
let newSettings;
|
||||||
|
|
||||||
|
// If the current setting is an object with options, preserve the structure
|
||||||
|
if (
|
||||||
|
prev[ key ] &&
|
||||||
|
typeof prev[ key ] === 'object' &&
|
||||||
|
'options' in prev[ key ]
|
||||||
|
) {
|
||||||
|
newSettings = {
|
||||||
|
...prev,
|
||||||
|
[ key ]: { ...prev[ key ], value },
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
// For simple settings, just set the value directly
|
||||||
|
newSettings = { ...prev, [ key ]: value };
|
||||||
|
}
|
||||||
|
|
||||||
// Check if there are unsaved changes
|
// Check if there are unsaved changes
|
||||||
const hasChanges = Object.keys( newSettings ).some(
|
const hasChanges = Object.keys( newSettings ).some(
|
||||||
( settingKey ) =>
|
( settingKey ) =>
|
||||||
newSettings[ settingKey ] !==
|
getSettingValue( newSettings[ settingKey ] ) !==
|
||||||
originalSettings[ settingKey ]
|
getSettingValue( originalSettings[ settingKey ] )
|
||||||
);
|
);
|
||||||
setHasUnsavedChanges( hasChanges );
|
setHasUnsavedChanges( hasChanges );
|
||||||
|
|
||||||
|
@ -77,8 +112,13 @@ export const useSettings = () => {
|
||||||
// Only send changed settings
|
// Only send changed settings
|
||||||
const changedSettings = {};
|
const changedSettings = {};
|
||||||
Object.keys( settings ).forEach( ( key ) => {
|
Object.keys( settings ).forEach( ( key ) => {
|
||||||
if ( settings[ key ] !== originalSettings[ key ] ) {
|
const currentValue = getSettingValue( settings[ key ] );
|
||||||
changedSettings[ key ] = settings[ key ];
|
const originalValue = getSettingValue(
|
||||||
|
originalSettings[ key ]
|
||||||
|
);
|
||||||
|
|
||||||
|
if ( currentValue !== originalValue ) {
|
||||||
|
changedSettings[ key ] = currentValue;
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
@ -121,7 +161,8 @@ export const useSettings = () => {
|
||||||
*/
|
*/
|
||||||
const resetSetting = useCallback(
|
const resetSetting = useCallback(
|
||||||
( key ) => {
|
( key ) => {
|
||||||
updateSetting( key, originalSettings[ key ] );
|
const originalValue = getSettingValue( originalSettings[ key ] );
|
||||||
|
updateSetting( key, originalValue );
|
||||||
},
|
},
|
||||||
[ originalSettings, updateSetting ]
|
[ originalSettings, updateSetting ]
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue