Добавлена локализация

.gitignore

@@ -3,4 +3,4 @@ ubl-settings-datetime.glade~
 test.cpp
 ubl-settings-datetime
 a.out
-source/ubl-settings-datetime
+source/**/ubl_settings_datetime

source/main.cc

@@ -33,8 +33,8 @@ int main(int argc, char* argv[]) {
         system(cmd.c_str());
         return 0;
     }
-    //setlocale(LC_ALL, '');
+    setlocale(LC_ALL, "");
-    bind_textdomain_codeset(app_name.c_str(), "UTF-8");
+    //bind_textdomain_codeset(app_name.c_str(), "UTF-8");
     textdomain(app_name.c_str());
     bindtextdomain(app_name.c_str(), path_locale.c_str());
     
@@ -69,7 +69,9 @@ int main(int argc, char* argv[]) {
             
             }
         MainWindow* wnd = nullptr;
+        
         builder->get_widget_derived("window", wnd);
+        
         auto r = app->run(*wnd);
 
         delete wnd;
@@ -80,7 +82,6 @@ int main(int argc, char* argv[]) {
         auto builder = Gtk::Builder::create_from_file(path_glade + "ubl-settings-datetime.glade");
         builder->set_translation_domain(app_name);
         Glib::init();
-        setlocale(LC_ALL, "");
         Glib::OptionContext context;
         CmdArgParser parser{
             "Socket ID",

source/ubl_settings_datetime.cc

@@ -70,6 +70,7 @@ void MainWindow::settings(){
     _numTimeMin->set_range(0,59);
     _numTimeHrs->set_increments(1.0,1.0);
     _numTimeMin->set_increments(1.0,1.0);
+    this->lacalization();
     //_txtDate->set_sensitive(false);
     this->get_config();
     this->flag_block_gui();
@@ -77,6 +78,26 @@ void MainWindow::settings(){
     this->parse_text_date();
 }
 void MainWindow::lacalization(){
+    _cbDhcp->append(gettext("DHCP"));
+    _cbDhcp->append(gettext("Вручную"));
+
+    _lblDateTimeSetting->set_text(gettext("Setting the date and time"));
+    _lblNtpServer1->set_text(gettext("Setting the date and time"));
+    _lblTime->set_text(gettext("Time"));
+    _lblData->set_text(gettext("Date"));
+    _lblTimeZone->set_text(gettext("Time zone"));
+    _lblReg->set_text(gettext("Region"));
+    _lblZone->set_text(gettext("Zone"));
+    _lblRegGlob->set_text(gettext("Region"));
+    _lblZone1Glob->set_text(gettext("Zone"));
+    _lblTimeZoneGlob->set_text(gettext("Time zone"));
+    _lblSynchronizebChk->set_text(gettext("Synchronize via NTP"));
+    _lblSynchronizeBtn->set_text(gettext("Sync by"));
+    _lblDateTimeSettingGlob->set_text(gettext("Setting date and time in global configuration"));
+    this->set_title(gettext("ubl-settings-datetime"));
+    _txtDate->set_tooltip_text("Date of\nFormat: DD.MM.YYYY");
+    _mess_dchp->set_title("Warning!");
+
     
 }
 void MainWindow::flag_block_gui(){
@@ -113,7 +134,6 @@ void MainWindow::add_CSS(){
     context->add_class("myButton");
 }
 void MainWindow::get_builder(){
-    
     builder->get_widget("btnUpdateDateTime", _btnUpdateDateTime);
     builder->get_widget("btnChooseDate", _btnChooseDate);
     builder->get_widget("btnMessClose", _btnMessClose);
@@ -132,6 +152,19 @@ void MainWindow::get_builder(){
     builder->get_widget("mess_dchp", _mess_dchp);
     builder->get_widget("lblMessage", _lblMessage);
     //this->add_CSS();
+    builder->get_widget("lblDateTimeSetting",_lblDateTimeSetting);
+    builder->get_widget("lblNtpServer1",_lblNtpServer1);
+    builder->get_widget("lblTime",_lblTime);
+    builder->get_widget("lblData",_lblData);
+    builder->get_widget("lblTimeZone",_lblTimeZone);
+    builder->get_widget("lblReg",_lblReg);
+    builder->get_widget("lblZone",_lblZone);
+    builder->get_widget("lblRegGlob",_lblRegGlob);
+    builder->get_widget("lblZone1Glob",_lblZone1Glob);
+    builder->get_widget("lblTimeZoneGlob",_lblTimeZoneGlob);
+    builder->get_widget("lblSynchronizebChk",_lblSynchronizebChk);
+    builder->get_widget("lblSynchronizeBtn",_lblSynchronizeBtn);
+    builder->get_widget("lblDateTimeSettingGlob",_lblDateTimeSettingGlob);
     }
 void MainWindow::event(){
     _btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close));
@@ -156,6 +189,7 @@ void MainWindow::gui_mess_close(){
 bool MainWindow::focus_ntp(GdkEventFocus* event){
     if (event!=NULL){}
     if (_txtNtpServer->get_text()=="" || _txtNtpServer->get_text()==" "){
+        _lblMessage->set_text(gettext("Enter DHCP !"));
         _mess_dchp->show();
     }
     else{
@@ -255,6 +289,7 @@ void MainWindow::enry_dhcp_mess(){
         }
         else{
             if (str_dhcp==""){
+                _lblMessage->set_text(gettext("Enter DHCP !"));
                 _mess_dchp->show();
             }
             else{
@@ -491,7 +526,7 @@ void MainWindow::update_time_date(){
             }
         }
         else{
-            _lblMessage->set_text("Не верный формат даты");
+            _lblMessage->set_text(gettext("Incorrect date format"));
             _mess_dchp->show();   
         }
     }

source/ubl_settings_datetime.h

@@ -63,7 +63,6 @@ public:
     MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);
     virtual ~MainWindow() = default;
     void lacalization();
-    void close_calendar();
     void settings();
     void flag_block_gui();
     void add_CSS();
@@ -109,6 +108,23 @@ private:
     Gtk::Popover *_popCalendar;
     Gtk::Calendar *_cldrDate;
     Gtk::Label *_lblMessage;
+
+    Gtk::Label *_lblDateTimeSetting;
+    Gtk::Label *_lblNtpServer1;
+    Gtk::Label *_lblTime;
+    Gtk::Label *_lblData;
+    Gtk::Label *_lblTimeZone;
+    Gtk::Label *_lblReg;
+    Gtk::Label *_lblZone;
+    Gtk::Label *_lblRegGlob;
+    Gtk::Label *_lblZone1Glob;
+    Gtk::Label *_lblTimeZoneGlob;
+    Gtk::Label *_lblSynchronizebChk;
+    Gtk::Label *_lblSynchronizeBtn;
+    Gtk::Label *_lblDateTimeSettingGlob;
+
+
+
     unsigned int year=0, month=0, day=0;
     int hour;
     int minute;

ubl-settings-datetime.glade

@@ -117,7 +117,6 @@
                 <property name="width-request">145</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="tooltip-text" translatable="yes">Изменить параметр NTPSERVERS</property>
                 <property name="margin-left">5</property>
                 <property name="margin-right">5</property>
                 <property name="margin-start">5</property>
@@ -217,7 +216,6 @@
                           <object class="GtkSpinButton" id="numTimeHrs">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
-                            <property name="tooltip-text" translatable="yes" context="Clock" comments="Clock">Часы</property>
                             <property name="margin-left">5</property>
                             <property name="margin-right">5</property>
                             <property name="margin-start">5</property>
@@ -250,7 +248,6 @@
                           <object class="GtkSpinButton" id="numTimeMin">
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
-                            <property name="tooltip-text" translatable="yes" context="Minutes" comments="Minutes">Минуты</property>
                             <property name="margin-left">5</property>
                             <property name="margin-right">5</property>
                             <property name="margin-start">5</property>
@@ -278,7 +275,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="lblData">
                             <property name="width-request">145</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
@@ -359,7 +356,6 @@
                             <property name="width-request">145</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="tooltip-text" translatable="yes" context="Change zone setting" comments="Change zone setting">Изменить параметр зоны</property>
                             <property name="margin-left">5</property>
                             <property name="margin-right">5</property>
                             <property name="margin-start">5</property>
@@ -500,7 +496,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel">
+                                  <object class="GtkLabel" id="lblSynchronizeBtn">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
                                     <property name="label" translatable="yes">Синхронизировать</property>
@@ -579,7 +575,6 @@
                         <property name="can-focus">False</property>
                         <child>
                           <object class="GtkCheckButton" id="cbxSynchronizeNtp">
-                            <property name="label" translatable="yes" context="Synchronize via NTP" comments="Synchronize via NTP">Синхронизировать через NTP</property>
                             <property name="visible">True</property>
                             <property name="can-focus">True</property>
                             <property name="receives-default">False</property>
@@ -591,6 +586,13 @@
                             <property name="margin-top">6</property>
                             <property name="margin-bottom">6</property>
                             <property name="draw-indicator">True</property>
+                            <child>
+                              <object class="GtkLabel" id="lblSynchronizebChk">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes" context="Synchronize via NTP" comments="Synchronize via NTP">Синхронизировать через NTP</property>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -602,13 +604,8 @@
                           <object class="GtkComboBoxText" id="cbDhcp">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="tooltip-text" translatable="yes" context="Synchronization method" comments="Synchronization method">Способ синхронизации</property>
                             <property name="margin-top">6</property>
                             <property name="margin-bottom">6</property>
-                            <items>
-                              <item translatable="yes" comments="DHCP" context="DHCP">DHCP</item>
-                              <item translatable="yes" comments="Manually" context="Manually">Вручную</item>
-                            </items>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -649,11 +646,10 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <child>
-                          <object class="GtkLabel" id="lblTimeZone1">
+                          <object class="GtkLabel" id="lblTimeZoneGlob">
                             <property name="width-request">145</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="tooltip-text" translatable="yes" context="Change zone setting" comments="Change zone setting">Изменить параметр зоны</property>
                             <property name="margin-left">5</property>
                             <property name="margin-right">5</property>
                             <property name="margin-start">5</property>
@@ -683,10 +679,9 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lblReg1">
+                          <object class="GtkLabel" id="lblRegGlob">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="tooltip-text" translatable="yes" context="Region" comments="Region">Регион</property>
                             <property name="margin-left">5</property>
                             <property name="margin-right">5</property>
                             <property name="margin-start">5</property>
@@ -720,10 +715,9 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lblZone1">
+                          <object class="GtkLabel" id="lblZone1Glob">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="tooltip-text" translatable="yes" context="Zone" comments="Zone">Зона</property>
                             <property name="margin-left">5</property>
                             <property name="margin-right">5</property>
                             <property name="margin-start">5</property>
@@ -780,7 +774,7 @@
                   </object>
                 </child>
                 <child type="label">
-                  <object class="GtkLabel" id="lblDateTimeSetting1">
+                  <object class="GtkLabel" id="lblDateTimeSettingGlob">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="label" translatable="yes" context="Setting date and time in global configuration" comments="Setting date and time in global configuration">Настройка даты и времени в глобальной конфигурации</property>

ubl-settings-datetime.po

@@ -0,0 +1,160 @@
+# 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-24 15:14+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:46
+msgid "Введите DHCP !"
+msgstr ""
+
+#: ubl-settings-datetime.glade:63
+msgid "OK"
+msgstr ""
+
+#. Date and Time Settings
+#: ubl-settings-datetime.glade:85
+msgctxt "Settings the date and time"
+msgid "Настройки даты и времени"
+msgstr ""
+
+#: ubl-settings-datetime.glade:120
+msgid "Изменить параметр NTPSERVERS"
+msgstr ""
+
+#. Setting the date and time
+#: ubl-settings-datetime.glade:127 ubl-settings-datetime.glade:536
+msgctxt "Setting the date and time"
+msgid "Настройка даты и времени"
+msgstr ""
+
+#. Time
+#: ubl-settings-datetime.glade:206
+msgctxt "Time"
+msgid "Время"
+msgstr ""
+
+#. Clock
+#: ubl-settings-datetime.glade:220
+msgctxt "Clock"
+msgid "Часы"
+msgstr ""
+
+#: ubl-settings-datetime.glade:241
+msgid ":"
+msgstr ""
+
+#. Minutes
+#: ubl-settings-datetime.glade:253
+msgctxt "Minutes"
+msgid "Минуты"
+msgstr ""
+
+#. Date
+#: ubl-settings-datetime.glade:291
+msgctxt "Date"
+msgid "Дата"
+msgstr ""
+
+#. Date of
+#. Format: DD.MM.YYYY
+#: ubl-settings-datetime.glade:306
+msgctxt ""
+"Date of\n"
+"Format: DD.MM.YYYY"
+msgid ""
+"Дата\n"
+"Формат: ДД.ММ.ГГГГ"
+msgstr ""
+
+#. Interactive date picker
+#: ubl-settings-datetime.glade:325
+msgctxt "Interactive date picker"
+msgid "Интерактивный выбор даты"
+msgstr ""
+
+#. Change zone setting
+#: ubl-settings-datetime.glade:362 ubl-settings-datetime.glade:658
+msgctxt "Change zone setting"
+msgid "Изменить параметр зоны"
+msgstr ""
+
+#. time zone
+#: ubl-settings-datetime.glade:369
+msgctxt "time zone"
+msgid "Часовой пояс"
+msgstr ""
+
+#. Region
+#: ubl-settings-datetime.glade:394 ubl-settings-datetime.glade:401
+#: ubl-settings-datetime.glade:691 ubl-settings-datetime.glade:698
+msgctxt "Region"
+msgid "Регион"
+msgstr ""
+
+#. Zone
+#: ubl-settings-datetime.glade:431 ubl-settings-datetime.glade:438
+#: ubl-settings-datetime.glade:728 ubl-settings-datetime.glade:733
+msgctxt "Zone"
+msgid "Зона"
+msgstr ""
+
+#: ubl-settings-datetime.glade:506
+msgid "Синхронизировать"
+msgstr ""
+
+#. Automatic time synchronization
+#: ubl-settings-datetime.glade:585
+msgctxt "Automatic time synchronization"
+msgid "Автоматическая синхронизация времени"
+msgstr ""
+
+#: ubl-settings-datetime.glade:597
+msgid "Синхронизировать через NTP"
+msgstr ""
+
+#. Synchronization method
+#: ubl-settings-datetime.glade:611
+msgctxt "Synchronization method"
+msgid "Способ синхронизации"
+msgstr ""
+
+#. Server input for date and time synchronization:
+#. Local (DHCP) or arbitrary
+#: ubl-settings-datetime.glade:626
+msgctxt ""
+"Server input for date and time synchronization:\n"
+"Local (DHCP) or arbitrary"
+msgid ""
+"Ввод сервера для синхронизации даты и времени:\n"
+"Локальный (DHCP) или произвольный"
+msgstr ""
+
+#. Time zone
+#: ubl-settings-datetime.glade:665
+msgctxt "Time zone"
+msgid "Часовой пояс"
+msgstr ""
+
+#. Setting date and time in global configuration
+#: ubl-settings-datetime.glade:788
+msgctxt "Setting date and time in global configuration"
+msgid "Настройка даты и времени в глобальной конфигурации"
+msgstr ""