Merge pull request 'develop' (#40) from develop into master

Reviewed-on: #40
pull/47/head
Dmitry Razumov 3 years ago
commit 3476d4c930

@ -1,123 +0,0 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-01-25 12:51+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ubl-settings-datetime.glade:7
msgid "Внимание!"
msgstr ""
#: ubl-settings-datetime.glade:45
msgid "Введите DHCP !"
msgstr ""
#: ubl-settings-datetime.glade:62
msgid "OK"
msgstr ""
#. Date and Time Settings
#: ubl-settings-datetime.glade:84
msgctxt "Settings the date and time"
msgid "Настройки даты и времени"
msgstr ""
#. Setting the date and time
#: ubl-settings-datetime.glade:125 ubl-settings-datetime.glade:531
msgctxt "Setting the date and time"
msgid "Настройка даты и времени"
msgstr ""
#. Time
#: ubl-settings-datetime.glade:204
msgctxt "Time"
msgid "Время"
msgstr ""
#: ubl-settings-datetime.glade:238
msgid ":"
msgstr ""
#. Date
#: ubl-settings-datetime.glade:287
msgctxt "Date"
msgid "Дата"
msgstr ""
#. Date of
#. Format: DD.MM.YYYY
#: ubl-settings-datetime.glade:302
msgctxt ""
"Date of\n"
"Format: DD.MM.YYYY"
msgid ""
"Дата\n"
"Формат: ДД.ММ.ГГГГ"
msgstr ""
#. Interactive date picker
#: ubl-settings-datetime.glade:321
msgctxt "Interactive date picker"
msgid "Интерактивный выбор даты"
msgstr ""
#. time zone
#: ubl-settings-datetime.glade:364
msgctxt "time zone"
msgid "Часовой пояс"
msgstr ""
#. Region
#: ubl-settings-datetime.glade:389 ubl-settings-datetime.glade:396
#: ubl-settings-datetime.glade:687
msgctxt "Region"
msgid "Регион"
msgstr ""
#. Zone
#: ubl-settings-datetime.glade:426 ubl-settings-datetime.glade:433
#: ubl-settings-datetime.glade:721
msgctxt "Zone"
msgid "Зона"
msgstr ""
#: ubl-settings-datetime.glade:501
msgid "Синхронизировать"
msgstr ""
#. Automatic time synchronization
#: ubl-settings-datetime.glade:580
msgctxt "Automatic time synchronization"
msgid "Автоматическая синхронизация времени"
msgstr ""
#. Synchronize via NTP
#: ubl-settings-datetime.glade:591
msgctxt "Synchronize via NTP"
msgid "Синхронизировать через NTP"
msgstr ""
#. Time zone
#: ubl-settings-datetime.glade:655
msgctxt "Time zone"
msgid "Часовой пояс"
msgstr ""
#. Setting date and time in global configuration
#: ubl-settings-datetime.glade:776
msgctxt "Setting date and time in global configuration"
msgid "Настройка даты и времени в глобальной конфигурации"
msgstr ""

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 50 KiB

@ -29,7 +29,6 @@
#include "unicode/utypes.h"
#include "unicode/utext.h"
#include <unicode/timezone.h>
#include <unicode/timezone.h>
#include <unicode/calendar.h>
#include "ubl-settings-datetime.h"
@ -74,7 +73,6 @@ MainWindow::MainWindow(Glib::RefPtr<Gtk::Builder> const& builder) {
void MainWindow::settings(){
year=0, month=0, day=0;
this->get_builder();
this->event();
this->lacalization();
if (this->check_root()==0){
numTimeHrs->set_range(0,23);
@ -83,7 +81,10 @@ void MainWindow::settings(){
numTimeMin->set_increments(1.0,1.0);
this->get_config();
this->flag_block_gui();
this->event();
this->parse_text_date();
}
else{
numTimeHrs->set_sensitive(false);
@ -108,6 +109,7 @@ void MainWindow::settings(){
lblRegGlob->set_sensitive(false);
lblZone1Glob->set_sensitive(false);
lblDateTimeSetting->set_sensitive(false);
this->event();
}
}
@ -384,7 +386,7 @@ void MainWindow::event_entry_cbDhcp(){
str_dhcp = str_dhcp.substr(str_dhcp.find("=")+1,str_dhcp.length());
str_dhcp = str_dhcp.substr(0,str_dhcp.find("\n"));
if (str_dhcp!="dhcp" && str_dhcp!="(null)"){
txtNtpServer->set_text("");
txtNtpServer->set_text(str_dhcp);
}
cbDhcp->set_active(activ_index);
}
@ -448,8 +450,8 @@ void MainWindow::calendar_show(){
void MainWindow::enry_dhcp_mess(){
string str_dhcp = this->call("/usr/bin/ubconfig get network NTPSERVERS");
if ((str_dhcp!="") && (str_dhcp!="(null)")){
this->set_ntp_toggle_glob();
cbxSynchronizeNtpGlob->set_active(1);
this->set_ntp_toggle_glob();
str_dhcp = str_dhcp.substr(str_dhcp.find("=")+1,str_dhcp.length());
str_dhcp = str_dhcp.substr(0,str_dhcp.find("\n"));
if (str_dhcp=="dhcp"){
@ -498,8 +500,7 @@ void MainWindow::get_config(){
string str_filling_zon = read_reg_zon_cfg.substr(read_reg_zon_cfg.find("/")+1,read_reg_zon_cfg.length());
str_filling_zon = str_filling_zon.substr(0,str_filling_zon.find("\n"));
string str_zone_check = "";
this->append_region_zone(str_filling_reg,str_filling_zon);
//this->append_region_zone("Africa","Abidjan");
this->append_region_zone(str_filling_reg,str_filling_zon);
}
else {
this->append_region_zone("Africa","Abidjan");
@ -585,7 +586,10 @@ void MainWindow::set_ntp_toggle_glob(){
}
else{
cbDhcp->set_sensitive(true);
txtNtpServer->set_sensitive(true);
int activ_index = cbDhcp->get_active_row_number();
if (activ_index==2){
txtNtpServer->set_sensitive(true);
}
}
}
@ -614,8 +618,8 @@ void MainWindow::append_region_zone(string region, string zone){
path_reg_zone=region+"/"+zone;
zone_offest = this->zone_file_read(path_reg_zone) + _(zone.c_str());
for (string &_str_zone : time_reg_map_local.at(region)){
cbZone->append(zone_mixing);
cbZoneGlob->append(zone_mixing);
cbZone->append(_str_zone);
cbZoneGlob->append(_str_zone);
if (_str_zone!=""){
if (zone_offest == _str_zone){
cbZone->set_active(index);

BIN
test

Binary file not shown.

@ -5,6 +5,16 @@
#
msgid ""
msgstr ""
"Project-Id-Version: ubconfig 1.0\n"
"Report-Msgid-Bugs-To: info@ublinux.ru\n"
"POT-Creation-Date: 2020-02-22 23:22+0600\n"
"PO-Revision-Date: 2020-02-22 23:28+0600\n"
"Last-Translator: ublinux <info@ublinux.ru>\n"
"Language-Team: Russian - UBLinux Team <info@ublinux.ru>\n"
"Language: Russian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "An invalid character is entered"
msgstr "Введён недопустимый символ"

Loading…
Cancel
Save