diff --git a/source/ubl-settings-datetime.c b/source/ubl-settings-datetime.c index 024058e..13bd660 100644 --- a/source/ubl-settings-datetime.c +++ b/source/ubl-settings-datetime.c @@ -364,7 +364,23 @@ void on_sync_clicked(GtkWidget *, main_window *widgets){ data->time=time; if (!yon_char_is_empty(date)){ int size; - config_str parsed = yon_char_parse((char*)date,&size,"."); + char *format = yon_settings_configuration_get(date_format_parameter); + config_str parsed = yon_char_parse((char*)date,&size,!strcmp(format,"%d.%m.%Y")?".":!strcmp(format,"%d/%m/%Y")?"/":"-"); + if (!strcmp(format,"%m-%d-%Y")){ + char *year = parsed[2]; + char *month = parsed[0]; + char *day = parsed[1]; + parsed[0]=year; + parsed[1]=month; + parsed[2]=day; + } else { + char *year = parsed[2]; + char *month = parsed[1]; + char *day = parsed[0]; + parsed[0]=year; + parsed[1]=month; + parsed[2]=day; + } data->date=yon_char_parsed_to_string(parsed,size,""); yon_char_parsed_free(parsed,size); } diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 86e0c45..5bbf2ce 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -46,7 +46,7 @@ #define ZONE_parameter_command "ubconfig --source global get clock ZONE" #define time_sync_command(time) yon_char_unite("pkexec date +%H:%M:%S -s \"",time,"\"",NULL) -#define date_sync_command(date) yon_char_unite("pkexec date +%Y%m%d -s \"",date,"\"",NULL) +#define date_sync_command(date) yon_char_unite("pkexec date -s \"",date,"\"",NULL) #define hardware_datetime_sync_command "hwclock --systohc" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 2ead441..6157d9b 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -30,4 +30,8 @@ #define YEAR_FORMAT_LABEL _("YYYY") #define MONTH_FORMAT_LABEL _("MM") -#define DAY_FORMAT_LABEL _("DD") \ No newline at end of file +#define DAY_FORMAT_LABEL _("DD") +#define DMY_FORMAT_LABEL _("DD.MM.YYYY") +#define DMY_MINUS_FORMAT_LABEL _("DD-MM-YYYY") +#define DMY_SLASH_FORMAT_LABEL _("DD/MM/YYY") +#define MDY_FORMAT_LABEL _("MM-DD-YYYY") \ No newline at end of file