mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Ensure that the query history date format in Desktop mode matches the format of the locale of the pgadmin server. #5495
Format the time based on pgadmin servers locale.
This commit is contained in:
@@ -649,6 +649,17 @@ def utils():
|
||||
except Exception:
|
||||
pg_libpq_version = 0
|
||||
|
||||
# Get the pgadmin server's locale
|
||||
default_locale = ''
|
||||
if current_app.PGADMIN_RUNTIME:
|
||||
import locale
|
||||
try:
|
||||
locale_info = locale.getdefaultlocale()
|
||||
if len(locale_info) > 0:
|
||||
default_locale = locale_info[0].replace('_', '-')
|
||||
except Exception:
|
||||
current_app.logger.debug('Failed to get the default locale.')
|
||||
|
||||
for submodule in current_blueprint.submodules:
|
||||
snippets.extend(submodule.jssnippets)
|
||||
return make_response(
|
||||
@@ -671,7 +682,8 @@ def utils():
|
||||
platform=sys.platform,
|
||||
qt_default_placeholder=QT_DEFAULT_PLACEHOLDER,
|
||||
vw_edt_default_placeholder=VW_EDT_DEFAULT_PLACEHOLDER,
|
||||
enable_psql=config.ENABLE_PSQL
|
||||
enable_psql=config.ENABLE_PSQL,
|
||||
pgadmin_server_locale=default_locale
|
||||
),
|
||||
200, {'Content-Type': MIMETYPE_APP_JS})
|
||||
|
||||
|
||||
@@ -61,6 +61,9 @@ define('pgadmin.browser.utils',
|
||||
/* GET Binary Path Browse config */
|
||||
pgAdmin['enable_binary_path_browsing'] = '{{ current_app.config.get('ENABLE_BINARY_PATH_BROWSING') }}' == 'True';
|
||||
|
||||
/* GET the pgadmin server's locale */
|
||||
pgAdmin['pgadmin_server_locale'] = '{{pgadmin_server_locale}}';
|
||||
|
||||
// Define list of nodes on which Query tool option doesn't appears
|
||||
let unsupported_nodes = pgAdmin.unsupported_nodes = [
|
||||
'server_group', 'server', 'coll-tablespace', 'tablespace',
|
||||
|
||||
Reference in New Issue
Block a user