Changeset 7123


Ignore:
Timestamp:
Apr 10, 2018, 11:18:22 AM (23 months ago)
Author:
jrpelegrina
Message:

Refactoring code

Location:
holiday-manager/trunk/fuentes
Files:
3 added
8 edited

Legend:

Unmodified
Added
Removed
  • holiday-manager/trunk/fuentes/debian/control

    r7116 r7123  
    1313Package: python3-holidaymanager
    1414Architecture: all
    15 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
     15Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, n4d-holidaymanager (= ${binary:Version})
    1616Description: API package
    17   Provides the API to manage holidays
     17  Provides the API to manage holidays and Gtk component
    1818
    1919
     
    2121Architecture: all
    2222Depends: ${misc:Depends}, ${python3:Depends}
    23 Description: Bell Scheduler pllugin
    24   Plugins supporting bell-scheduler functionality 
     23Description: Holiday Manager plugin
     24  Plugins supporting holiday-manager functionality 
    2525
  • holiday-manager/trunk/fuentes/debian/copyright

    r7106 r7123  
    11Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
    22Upstream-Name: epi
    3 Source: https://svn.lliurex.net/xenial/holiday-manager
     3Source: https://svn.lliurex.net/xenial/bell-scheduler
    44
    55Files: *
  • holiday-manager/trunk/fuentes/holiday-manager/python3-holidaymanager/HolidayBox.py

    r7117 r7123  
    1818import ssl
    1919from datetime import datetime, date,timedelta
    20 
    21 CSS_PATH="/usr/lib/python3/dist-packages/bellscheduler/rsrc/bell-scheduler.css"
    2220
    2321
     
    4543                builder.add_from_file(ui_path) 
    4644
     45                self.css_file=settings.RSRC_DIR+"/holiday-manager.css"
     46
    4747                self.main_box=builder.get_object("holiday_box")
    48                 self.calendar=builder.get_object("calendar")
     48                self.holiday_calendar=builder.get_object("calendar")
    4949                self.single_day_rb=builder.get_object("single_day_rb")
    5050                self.single_day_entry=builder.get_object("single_day_entry")
     
    8989
    9090                self.pack_start(self.main_box,True,True,0)
     91                self.set_css_info()
    9192                self.connect_signals()
    9293                self.init_calendar()
    93                 self.clear_days=True
    94                 self.day=""
     94                #self.clear_days=True
     95                #self.day=""
    9596
    9697        #def render_form       
     98
     99
     100        def set_css_info(self):
     101               
     102               
     103                self.style_provider=Gtk.CssProvider()
     104                f=Gio.File.new_for_path(self.css_file)
     105                self.style_provider.load_from_file(f)
     106                Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(),self.style_provider,Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
     107                self.holiday_calendar.set_name("CALENDAR")
     108
     109        #def set_css_info       
    97110
    98111
     
    101114                self.single_day_rb.connect("toggled",self.day_toggled_button,"singleDay")
    102115                self.range_day_rb.connect("toggled",self.day_toggled_button,"rangeDay")
    103                 self.calendar.connect("month-changed",self.month_changed)
    104                 self.calendar.connect("day_selected",self.day_selected)
     116                self.holiday_calendar.connect("month-changed",self.month_changed)
     117                self.holiday_calendar.connect("day_selected",self.day_selected)
    105118                self.remove_range_button.connect("clicked",self.remove_range)
    106119                self.add_day_button.connect("clicked",self.add_day_clicked)
     
    122135                self.calendar_message.set_text("")
    123136
    124         #def _init_connect     
     137        #def _start_api_connect
    125138
    126139
     
    128141
    129142                self.range=False
     143                self.clear_days=True
     144                self.day=""
    130145                self.days_inrange=[]
    131146                current_date=date.today().strftime('%d/%m/%Y').split("/")
     
    133148                current_year=int(current_date[2])
    134149
    135                 self.calendar.select_day(0)
    136                 self.calendar.select_month(current_month,current_year)
     150                self.holiday_calendar.select_day(0)
     151                self.holiday_calendar.select_month(current_month,current_year)
    137152                self.single_day_rb.set_active(True)
    138153                self.single_day_entry.set_text("")
     
    149164
    150165                if button.get_active():
    151                         self.calendar.clear_marks()
     166                        self.holiday_calendar.clear_marks()
    152167
    153168                        if name=="singleDay":
     
    230245        def month_changed(self,widget):
    231246
    232                 self.calendar.select_day(0)
    233                 self.calendar.clear_marks()
    234                 if self.range:
    235                         if not self.clear_days:
    236                                 month_ref=self.calendar.get_date().month
    237                                 year_ref=self.calendar.get_date().year
    238                                 if len(self.days_inrange)>0:
    239                                         for i in self.days_inrange:
    240                                                 tmp_day=int(i.split("/")[0])
    241                                                 tmp_month=int(i.split("/")[1])-1
    242                                                 tmp_year=int(i.split("/")[2])
    243                                                 if tmp_month==month_ref and tmp_year==year_ref:
    244                                                                 self.calendar.mark_day(tmp_day)
     247                self.holiday_calendar.select_day(0)
     248                self.holiday_calendar.clear_marks()
     249                if not self.clear_days:
     250                        self.marked_range_days(0)
     251
     252                else:
     253                        date=self.range_day1_entry.get_text()
     254                        if date!="":
     255                                month_ref=self.holiday_calendar.get_date().month
     256                                year_ref=self.holiday_calendar.get_date().year 
     257
     258                                split_date=self._splited_date(date)
     259                                tmp_day=split_date[0]
     260                                tmp_month=split_date[1]
     261                                tmp_year=split_date[2]
     262       
     263                                if tmp_month==month_ref and tmp_year==year_ref:
     264                                        self.holiday_calendar.mark_day(tmp_day)                         
     265               
    245266
    246267        #def month_changed                                                     
     
    249270               
    250271
    251                 date_selected=self.calendar.get_date()
     272                date_selected=self.holiday_calendar.get_date()
    252273               
    253274
     
    266287
    267288                        if not self.range:
    268                                 self.calendar.clear_marks()
     289                                self.holiday_calendar.clear_marks()
    269290                                self.single_day_entry.set_text(date_format)
     291                                self.range=False
     292                                self.clear_days=False
    270293                        else:
    271294                                if self.range_day1_entry.get_text()=="":
    272                                         self.calendar.clear_marks()
     295                                        self.holiday_calendar.clear_marks()
    273296                                        self.range_day1_entry.set_text(date_format)
    274                                         self.calendar.mark_day(day_selected)
    275                                         self.calendar.select_day(0)
     297                                        self.holiday_calendar.mark_day(day_selected)
     298                                        self.holiday_calendar.select_day(0)
     299
    276300                                else:
    277301                                        if self.range_day2_entry.get_text()=="":
     
    279303                                                date2=datetime.strptime(date_format,"%d/%m/%Y")
    280304                                                if date2>date1:
     305                                                        self.range=True
     306                                                        self.clear_days=False
    281307                                                        self.range_day2_entry.set_text(date_format)     
    282                                                         self.calendar.mark_day(day_selected)
    283                                                         self.calendar.select_day(0)
     308                                                        range_day=self.range_day1_entry.get_text()+"-"+self.range_day2_entry.get_text()
     309                                                        self.marked_range_days(2,range_day)
     310                                                        self.holiday_calendar.select_day(0)
    284311                                                        self.calendar_message.set_text("")
    285312                                                else:
    286                                                         self.manage_message(True,12)
    287 
     313                                                        self.manage_message(True,12)   
    288314        #def day_selected                                               
    289315
     316       
     317        def marked_range_days(self,monthref,range_day=None):
     318
     319                if range_day!=None:
     320                        if self.range:
     321                                self.days_inrange=self.holidayManager.get_days_inrange(range_day)
     322
     323                if monthref==0:
     324                        ref_month=self.holiday_calendar.get_date().month
     325                        ref_year=self.holiday_calendar.get_date().year
     326
     327                elif monthref==1:
     328                        if self.range:
     329                                ref_date=self.range_day1_entry.get_text()
     330                        else:
     331                                ref_date=self.single_day_entry.get_text()
     332                               
     333                        split_date=self._splited_date(ref_date)
     334                        ref_month=split_date[1]
     335                        ref_year=split_date[2]
     336
     337                        self.holiday_calendar.select_month(ref_month,ref_year)
     338
     339                else:
     340                        split_date=self._splited_date(self.range_day2_entry.get_text())
     341                        ref_month=split_date[1]
     342                        ref_year=split_date[2]
     343
     344                if self.range:
     345                        for i in self.days_inrange:
     346                                split_date=self._splited_date(i)
     347                                tmp_day=split_date[0]
     348                                tmp_month=split_date[1]
     349                                tmp_year=split_date[2]
     350                                if tmp_month==ref_month and tmp_year==ref_year:
     351                                        self.holiday_calendar.mark_day(tmp_day)
     352                       
     353                else:
     354                        split_date=self._splited_date(self.single_day_entry.get_text())
     355                        tmp_day=split_date[0]
     356                        tmp_month=split_date[1]
     357                        tmp_year=split_date[2]
     358                       
     359                        if tmp_month==ref_month and tmp_year==ref_year:
     360                                self.holiday_calendar.mark_day(tmp_day)         
     361
     362        #def marked_range_days                 
     363
     364        def _splited_date(self,date):
     365
     366                splited_date=[]
     367                tmp_date=date.split("/")
     368                tmp_day=int(tmp_date[0])
     369                tmp_month=int(tmp_date[1])-1
     370                tmp_year=int(tmp_date[2])
     371
     372                splited_date=[tmp_day,tmp_month,tmp_year]
     373               
     374                return splited_date
     375
     376        #def _splited_date     
    290377
    291378        def remove_range(self,widget):
    292379
    293                 self.calendar.clear_marks()
     380                self.holiday_calendar.clear_marks()
    294381                self.clear_days=True
    295                 self.calendar.select_day(0)
     382                self.holiday_calendar.select_day(0)
    296383                self.range_day1_entry.set_text("")
    297384                self.range_day2_entry.set_text("")
     
    359446                if "-" in self.day:
    360447                        self.range=True
    361                         self.days_inrange=self.holidayManager.get_days_inrange(self.day)
    362                         self.calendar.clear_marks()
     448                        self.holiday_calendar.clear_marks()
    363449                        tmp=self.day.split("-")
    364450                        self.range_day_rb.set_active(True)
    365451                        self.range_day1_entry.set_text(tmp[0])
    366                         tmp_day1=tmp[0].split("/")
    367                         self.month1=int(tmp_day1[1])-1
    368                         tmp_day2=tmp[1].split("/")
    369                         self.month2=int(tmp_day2[1])-1
    370 
    371                         year=int(tmp_day1[2])
    372                         self.calendar.select_month(self.month1,year)
    373452                        self.range_day2_entry.set_text(tmp[1])
    374453                       
    375                         for i in self.days_inrange:
    376                                 tmp_day=int(i.split("/")[0])
    377                                 tmp_month=int(i.split("/")[1])-1
    378                                 tmp_year=int(i.split("/")[2])
    379 
    380                                 if tmp_month==self.month1:
    381                                         self.calendar.mark_day(tmp_day)
    382 
    383454                else:
    384455                        self.range=False
    385                         self.calendar.clear_marks()
     456                        self.holiday_calendar.clear_marks()
    386457                        self.single_day_rb.set_active(True)
    387458                        self.single_day_entry.set_text(self.day)
    388                         tmp_day=self.day.split("/")
    389                         day=int(tmp_day[0])
    390                         month=int(tmp_day[1])-1
    391                         year=int(tmp_day[2])
    392 
    393                         self.calendar.select_month(month,year)
    394                         self.calendar.mark_day(day)
    395                
    396                
     459                       
     460                self.marked_range_days(1,self.day)
    397461                self.coment_day_entry.set_text(self.coment_day)
    398462
     
    425489                error=False
    426490                dialog = Gtk.MessageDialog(None,0,Gtk.MessageType.WARNING, Gtk.ButtonsType.YES_NO, self.app_name)
    427                 dialog.format_secondary_text(_("Dates will be deleted. Do you want to continue?"))
     491                dialog.format_secondary_text(_("The current list of dates will be deleted. Do you want to continue?"))
    428492                response=dialog.run()
    429493                dialog.destroy()
  • holiday-manager/trunk/fuentes/holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui

    r7116 r7123  
    424424                                <property name="can_focus">True</property>
    425425                                <property name="receives_default">True</property>
    426                                 <property name="tooltip_text" translatable="yes">Delete dates</property>
     426                                <property name="tooltip_text" translatable="yes">Clean date range</property>
    427427                                <property name="margin_bottom">10</property>
    428428                                <child>
     
    430430                                    <property name="visible">True</property>
    431431                                    <property name="can_focus">False</property>
    432                                     <property name="stock">gtk-delete</property>
     432                                    <property name="stock">gtk-clear</property>
    433433                                  </object>
    434434                                </child>
  • holiday-manager/trunk/fuentes/translations/ca_ES.UTF-8@valencia.po

    r7116 r7123  
    77msgid ""
    88msgstr ""
    9 "Project-Id-Version: PACKAGE VERSION\n"
     9"Project-Id-Version: \n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2018-04-05 09:19+0200\n"
    12 "PO-Revision-Date: 2018-04-05 09:20+0200\n"
     11"POT-Creation-Date: 2018-04-10 08:31+0200\n"
     12"PO-Revision-Date: 2018-04-10 08:31+0200\n"
    1313"Last-Translator: lliurex <lliurex@gva.es>\n"
    1414"Language-Team: Spanish\n"
     
    1818"Content-Transfer-Encoding: 8bit\n"
    1919"Plural-Forms: nplurals=2; plural=(n != 1);\n"
     20"X-Generator: Poedit 1.8.7.1\n"
    2021
    21 #: holiday-manager/python3-holidaymanager/HolidayBox.py:67
     22#: holiday-manager/python3-holidaymanager/HolidayBox.py:64
    2223msgid "Date"
    2324msgstr ""
    2425
    25 #: holiday-manager/python3-holidaymanager/HolidayBox.py:77
     26#: holiday-manager/python3-holidaymanager/HolidayBox.py:74
    2627#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:466
    2728msgid "Comment"
    2829msgstr ""
    2930
    30 #: holiday-manager/python3-holidaymanager/HolidayBox.py:409
     31#: holiday-manager/python3-holidaymanager/HolidayBox.py:470
    3132msgid "The date will be deleted. Do you want to continue?"
    3233msgstr ""
    3334
    34 #: holiday-manager/python3-holidaymanager/HolidayBox.py:429
    35 msgid "Dates will be deleted. Do you want to continue?"
     35#: holiday-manager/python3-holidaymanager/HolidayBox.py:490
     36msgid "The current list of dates will be deleted. Do you want to continue?"
    3637msgstr ""
    3738
    38 #: holiday-manager/python3-holidaymanager/HolidayBox.py:449
     39#: holiday-manager/python3-holidaymanager/HolidayBox.py:510
    3940msgid "Please choose a file to save day list"
    4041msgstr ""
    4142
    42 #: holiday-manager/python3-holidaymanager/HolidayBox.py:471
     43#: holiday-manager/python3-holidaymanager/HolidayBox.py:534
    4344msgid ""
    4445"New dates list will be loaded and replace the existing configutarion. Do you "
     
    4647msgstr ""
    4748
    48 #: holiday-manager/python3-holidaymanager/HolidayBox.py:475
     49#: holiday-manager/python3-holidaymanager/HolidayBox.py:538
    4950msgid "Please choose a file to load dates list"
    5051msgstr ""
    5152
    52 #: holiday-manager/python3-holidaymanager/HolidayBox.py:511
     53#: holiday-manager/python3-holidaymanager/HolidayBox.py:575
    5354msgid "Unabled to apply changes. List blocked for other user"
    5455msgstr ""
    5556
    56 #: holiday-manager/python3-holidaymanager/HolidayBox.py:513
     57#: holiday-manager/python3-holidaymanager/HolidayBox.py:577
    5758msgid "Changes apply succesfully"
    5859msgstr ""
    5960
    60 #: holiday-manager/python3-holidaymanager/HolidayBox.py:515
     61#: holiday-manager/python3-holidaymanager/HolidayBox.py:579
    6162msgid "Error saving changes"
    6263msgstr ""
    6364
    64 #: holiday-manager/python3-holidaymanager/HolidayBox.py:517
     65#: holiday-manager/python3-holidaymanager/HolidayBox.py:581
    6566msgid "List of dates imported successfully"
    6667msgstr ""
    6768
    68 #: holiday-manager/python3-holidaymanager/HolidayBox.py:519
     69#: holiday-manager/python3-holidaymanager/HolidayBox.py:583
    6970msgid "Unabled to import list. List blocked for other user"
    7071msgstr ""
    7172
    72 #: holiday-manager/python3-holidaymanager/HolidayBox.py:521
     73#: holiday-manager/python3-holidaymanager/HolidayBox.py:585
    7374msgid "Error importing the list of dates"
    7475msgstr ""
    7576
    76 #: holiday-manager/python3-holidaymanager/HolidayBox.py:523
     77#: holiday-manager/python3-holidaymanager/HolidayBox.py:587
    7778msgid "The list of dates to be imported does not exist"
    7879msgstr ""
    7980
    80 #: holiday-manager/python3-holidaymanager/HolidayBox.py:525
     81#: holiday-manager/python3-holidaymanager/HolidayBox.py:589
    8182msgid "List of dates exported successfully"
    8283msgstr ""
    8384
    84 #: holiday-manager/python3-holidaymanager/HolidayBox.py:527
     85#: holiday-manager/python3-holidaymanager/HolidayBox.py:591
    8586msgid "Error exporting the list of dates"
    8687msgstr ""
    8788
    88 #: holiday-manager/python3-holidaymanager/HolidayBox.py:529
     89#: holiday-manager/python3-holidaymanager/HolidayBox.py:593
    8990msgid "Last date in range must be major than init date"
    9091msgstr ""
    9192
    92 #: holiday-manager/python3-holidaymanager/HolidayBox.py:531
     93#: holiday-manager/python3-holidaymanager/HolidayBox.py:595
    9394msgid "You must indicate the two dates of range"
    9495msgstr ""
    9596
    96 #: holiday-manager/python3-holidaymanager/HolidayBox.py:533
     97#: holiday-manager/python3-holidaymanager/HolidayBox.py:597
    9798msgid "You must indicate the date"
    9899msgstr ""
     
    131132
    132133#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:426
    133 msgid "Delete dates"
     134msgid "Clean date range"
    134135msgstr ""
    135136
  • holiday-manager/trunk/fuentes/translations/ca_ES@valencia.po

    r7116 r7123  
    77msgid ""
    88msgstr ""
    9 "Project-Id-Version: PACKAGE VERSION\n"
     9"Project-Id-Version: \n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2018-04-05 09:19+0200\n"
    12 "PO-Revision-Date: 2018-04-05 09:20+0200\n"
     11"POT-Creation-Date: 2018-04-10 08:30+0200\n"
     12"PO-Revision-Date: 2018-04-10 08:30+0200\n"
    1313"Last-Translator: lliurex <lliurex@gva.es>\n"
    1414"Language-Team: Spanish\n"
     
    1818"Content-Transfer-Encoding: 8bit\n"
    1919"Plural-Forms: nplurals=2; plural=(n != 1);\n"
     20"X-Generator: Poedit 1.8.7.1\n"
    2021
    21 #: holiday-manager/python3-holidaymanager/HolidayBox.py:67
     22#: holiday-manager/python3-holidaymanager/HolidayBox.py:64
    2223msgid "Date"
    2324msgstr ""
    2425
    25 #: holiday-manager/python3-holidaymanager/HolidayBox.py:77
     26#: holiday-manager/python3-holidaymanager/HolidayBox.py:74
    2627#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:466
    2728msgid "Comment"
    2829msgstr ""
    2930
    30 #: holiday-manager/python3-holidaymanager/HolidayBox.py:409
     31#: holiday-manager/python3-holidaymanager/HolidayBox.py:470
    3132msgid "The date will be deleted. Do you want to continue?"
    3233msgstr ""
    3334
    34 #: holiday-manager/python3-holidaymanager/HolidayBox.py:429
    35 msgid "Dates will be deleted. Do you want to continue?"
     35#: holiday-manager/python3-holidaymanager/HolidayBox.py:490
     36msgid "The current list of dates will be deleted. Do you want to continue?"
    3637msgstr ""
    3738
    38 #: holiday-manager/python3-holidaymanager/HolidayBox.py:449
     39#: holiday-manager/python3-holidaymanager/HolidayBox.py:510
    3940msgid "Please choose a file to save day list"
    4041msgstr ""
    4142
    42 #: holiday-manager/python3-holidaymanager/HolidayBox.py:471
     43#: holiday-manager/python3-holidaymanager/HolidayBox.py:534
    4344msgid ""
    4445"New dates list will be loaded and replace the existing configutarion. Do you "
     
    4647msgstr ""
    4748
    48 #: holiday-manager/python3-holidaymanager/HolidayBox.py:475
     49#: holiday-manager/python3-holidaymanager/HolidayBox.py:538
    4950msgid "Please choose a file to load dates list"
    5051msgstr ""
    5152
    52 #: holiday-manager/python3-holidaymanager/HolidayBox.py:511
     53#: holiday-manager/python3-holidaymanager/HolidayBox.py:575
    5354msgid "Unabled to apply changes. List blocked for other user"
    5455msgstr ""
    5556
    56 #: holiday-manager/python3-holidaymanager/HolidayBox.py:513
     57#: holiday-manager/python3-holidaymanager/HolidayBox.py:577
    5758msgid "Changes apply succesfully"
    5859msgstr ""
    5960
    60 #: holiday-manager/python3-holidaymanager/HolidayBox.py:515
     61#: holiday-manager/python3-holidaymanager/HolidayBox.py:579
    6162msgid "Error saving changes"
    6263msgstr ""
    6364
    64 #: holiday-manager/python3-holidaymanager/HolidayBox.py:517
     65#: holiday-manager/python3-holidaymanager/HolidayBox.py:581
    6566msgid "List of dates imported successfully"
    6667msgstr ""
    6768
    68 #: holiday-manager/python3-holidaymanager/HolidayBox.py:519
     69#: holiday-manager/python3-holidaymanager/HolidayBox.py:583
    6970msgid "Unabled to import list. List blocked for other user"
    7071msgstr ""
    7172
    72 #: holiday-manager/python3-holidaymanager/HolidayBox.py:521
     73#: holiday-manager/python3-holidaymanager/HolidayBox.py:585
    7374msgid "Error importing the list of dates"
    7475msgstr ""
    7576
    76 #: holiday-manager/python3-holidaymanager/HolidayBox.py:523
     77#: holiday-manager/python3-holidaymanager/HolidayBox.py:587
    7778msgid "The list of dates to be imported does not exist"
    7879msgstr ""
    7980
    80 #: holiday-manager/python3-holidaymanager/HolidayBox.py:525
     81#: holiday-manager/python3-holidaymanager/HolidayBox.py:589
    8182msgid "List of dates exported successfully"
    8283msgstr ""
    8384
    84 #: holiday-manager/python3-holidaymanager/HolidayBox.py:527
     85#: holiday-manager/python3-holidaymanager/HolidayBox.py:591
    8586msgid "Error exporting the list of dates"
    8687msgstr ""
    8788
    88 #: holiday-manager/python3-holidaymanager/HolidayBox.py:529
     89#: holiday-manager/python3-holidaymanager/HolidayBox.py:593
    8990msgid "Last date in range must be major than init date"
    9091msgstr ""
    9192
    92 #: holiday-manager/python3-holidaymanager/HolidayBox.py:531
     93#: holiday-manager/python3-holidaymanager/HolidayBox.py:595
    9394msgid "You must indicate the two dates of range"
    9495msgstr ""
    9596
    96 #: holiday-manager/python3-holidaymanager/HolidayBox.py:533
     97#: holiday-manager/python3-holidaymanager/HolidayBox.py:597
    9798msgid "You must indicate the date"
    9899msgstr ""
     
    131132
    132133#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:426
    133 msgid "Delete dates"
     134msgid "Clean date range"
    134135msgstr ""
    135136
  • holiday-manager/trunk/fuentes/translations/es.po

    r7116 r7123  
    99"Project-Id-Version: \n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2018-04-05 09:19+0200\n"
    12 "PO-Revision-Date: 2018-04-05 11:46+0200\n"
     11"POT-Creation-Date: 2018-04-10 08:30+0200\n"
     12"PO-Revision-Date: 2018-04-10 08:56+0200\n"
    1313"Last-Translator: lliurex <lliurex@gva.es>\n"
    1414"Language-Team: Spanish\n"
     
    2020"X-Generator: Poedit 1.8.7.1\n"
    2121
    22 #: holiday-manager/python3-holidaymanager/HolidayBox.py:67
     22#: holiday-manager/python3-holidaymanager/HolidayBox.py:64
    2323msgid "Date"
    2424msgstr "Fecha"
    2525
    26 #: holiday-manager/python3-holidaymanager/HolidayBox.py:77
     26#: holiday-manager/python3-holidaymanager/HolidayBox.py:74
    2727#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:466
    2828msgid "Comment"
    2929msgstr "Comentario"
    3030
    31 #: holiday-manager/python3-holidaymanager/HolidayBox.py:409
     31#: holiday-manager/python3-holidaymanager/HolidayBox.py:470
    3232msgid "The date will be deleted. Do you want to continue?"
    3333msgstr "La fecha será borrada. ¿Desea continuar?"
    3434
    35 #: holiday-manager/python3-holidaymanager/HolidayBox.py:429
    36 msgid "Dates will be deleted. Do you want to continue?"
    37 msgstr "Las fechas serán borradas. ¿Desea continuar?"
     35#: holiday-manager/python3-holidaymanager/HolidayBox.py:490
     36msgid "The current list of dates will be deleted. Do you want to continue?"
     37msgstr "La lista de fechas actual será eliminada. ¿Desea continuar?"
    3838
    39 #: holiday-manager/python3-holidaymanager/HolidayBox.py:449
     39#: holiday-manager/python3-holidaymanager/HolidayBox.py:510
    4040msgid "Please choose a file to save day list"
    4141msgstr "Seleccione un fichero para guardar la lista de fechas"
    4242
    43 #: holiday-manager/python3-holidaymanager/HolidayBox.py:471
     43#: holiday-manager/python3-holidaymanager/HolidayBox.py:534
    4444msgid ""
    4545"New dates list will be loaded and replace the existing configutarion. Do you "
     
    4949"existente. ¿Desea continuar?"
    5050
    51 #: holiday-manager/python3-holidaymanager/HolidayBox.py:475
     51#: holiday-manager/python3-holidaymanager/HolidayBox.py:538
    5252msgid "Please choose a file to load dates list"
    5353msgstr "Seleccione un fichero para cargar la lista de fechas"
    5454
    55 #: holiday-manager/python3-holidaymanager/HolidayBox.py:511
     55#: holiday-manager/python3-holidaymanager/HolidayBox.py:575
    5656msgid "Unabled to apply changes. List blocked for other user"
    5757msgstr ""
    5858"Imposible aplicar los cambios. La lista esta bloqueada por otro usuario"
    5959
    60 #: holiday-manager/python3-holidaymanager/HolidayBox.py:513
     60#: holiday-manager/python3-holidaymanager/HolidayBox.py:577
    6161msgid "Changes apply succesfully"
    6262msgstr "Cambios aplicados correctamente"
    6363
    64 #: holiday-manager/python3-holidaymanager/HolidayBox.py:515
     64#: holiday-manager/python3-holidaymanager/HolidayBox.py:579
    6565msgid "Error saving changes"
    6666msgstr "Error guardando los cambops"
    6767
    68 #: holiday-manager/python3-holidaymanager/HolidayBox.py:517
     68#: holiday-manager/python3-holidaymanager/HolidayBox.py:581
    6969msgid "List of dates imported successfully"
    7070msgstr "La lista de fechas se ha importado correctamente"
    7171
    72 #: holiday-manager/python3-holidaymanager/HolidayBox.py:519
     72#: holiday-manager/python3-holidaymanager/HolidayBox.py:583
    7373msgid "Unabled to import list. List blocked for other user"
    7474msgstr "Imposible importar la lista. La lista esta bloqueada por otro usuario"
    7575
    76 #: holiday-manager/python3-holidaymanager/HolidayBox.py:521
     76#: holiday-manager/python3-holidaymanager/HolidayBox.py:585
    7777msgid "Error importing the list of dates"
    7878msgstr "Error importando la lista de fechas"
    7979
    80 #: holiday-manager/python3-holidaymanager/HolidayBox.py:523
     80#: holiday-manager/python3-holidaymanager/HolidayBox.py:587
    8181msgid "The list of dates to be imported does not exist"
    8282msgstr "La lista de fechas a importar no existe"
    8383
    84 #: holiday-manager/python3-holidaymanager/HolidayBox.py:525
     84#: holiday-manager/python3-holidaymanager/HolidayBox.py:589
    8585msgid "List of dates exported successfully"
    8686msgstr "La lista de fechas se ha exportado correctamente"
    8787
    88 #: holiday-manager/python3-holidaymanager/HolidayBox.py:527
     88#: holiday-manager/python3-holidaymanager/HolidayBox.py:591
    8989msgid "Error exporting the list of dates"
    9090msgstr "Error exportando la lista de fechas"
    9191
    92 #: holiday-manager/python3-holidaymanager/HolidayBox.py:529
     92#: holiday-manager/python3-holidaymanager/HolidayBox.py:593
    9393msgid "Last date in range must be major than init date"
    9494msgstr "La última fecha del rango debe ser mayor que la fecha inicial"
    9595
    96 #: holiday-manager/python3-holidaymanager/HolidayBox.py:531
     96#: holiday-manager/python3-holidaymanager/HolidayBox.py:595
    9797msgid "You must indicate the two dates of range"
    9898msgstr "Debe indicar las 2 fechas del rango"
    9999
    100 #: holiday-manager/python3-holidaymanager/HolidayBox.py:533
     100#: holiday-manager/python3-holidaymanager/HolidayBox.py:597
    101101msgid "You must indicate the date"
    102102msgstr "Debe indicar la fecha"
     
    135135
    136136#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:426
    137 msgid "Delete dates"
    138 msgstr "Borrar fechas"
     137msgid "Clean date range"
     138msgstr "Borrar rango de fechas"
    139139
    140140#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:530
     
    145145msgid "Apply changes"
    146146msgstr "Aplicar cambios"
     147
     148#~ msgid "Dates will be deleted. Do you want to continue?"
     149#~ msgstr "Las fechas serán borradas. ¿Desea continuar?"
     150
     151#~ msgid "Delete dates"
     152#~ msgstr "Borrar fechas"
  • holiday-manager/trunk/fuentes/translations/holiday-manager.pot

    r7116 r7123  
    99"Project-Id-Version: PACKAGE VERSION\n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2018-04-05 09:19+0200\n"
     11"POT-Creation-Date: 2018-04-10 08:29+0200\n"
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
     
    1818"Content-Transfer-Encoding: 8bit\n"
    1919
    20 #: holiday-manager/python3-holidaymanager/HolidayBox.py:67
     20#: holiday-manager/python3-holidaymanager/HolidayBox.py:64
    2121msgid "Date"
    2222msgstr ""
    2323
    24 #: holiday-manager/python3-holidaymanager/HolidayBox.py:77
     24#: holiday-manager/python3-holidaymanager/HolidayBox.py:74
    2525#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:466
    2626msgid "Comment"
    2727msgstr ""
    2828
    29 #: holiday-manager/python3-holidaymanager/HolidayBox.py:409
     29#: holiday-manager/python3-holidaymanager/HolidayBox.py:470
    3030msgid "The date will be deleted. Do you want to continue?"
    3131msgstr ""
    3232
    33 #: holiday-manager/python3-holidaymanager/HolidayBox.py:429
    34 msgid "Dates will be deleted. Do you want to continue?"
     33#: holiday-manager/python3-holidaymanager/HolidayBox.py:490
     34msgid "The current list of dates will be deleted. Do you want to continue?"
    3535msgstr ""
    3636
    37 #: holiday-manager/python3-holidaymanager/HolidayBox.py:449
     37#: holiday-manager/python3-holidaymanager/HolidayBox.py:510
    3838msgid "Please choose a file to save day list"
    3939msgstr ""
    4040
    41 #: holiday-manager/python3-holidaymanager/HolidayBox.py:471
     41#: holiday-manager/python3-holidaymanager/HolidayBox.py:534
    4242msgid ""
    4343"New dates list will be loaded and replace the existing configutarion. Do you "
     
    4545msgstr ""
    4646
    47 #: holiday-manager/python3-holidaymanager/HolidayBox.py:475
     47#: holiday-manager/python3-holidaymanager/HolidayBox.py:538
    4848msgid "Please choose a file to load dates list"
    4949msgstr ""
    5050
    51 #: holiday-manager/python3-holidaymanager/HolidayBox.py:511
     51#: holiday-manager/python3-holidaymanager/HolidayBox.py:575
    5252msgid "Unabled to apply changes. List blocked for other user"
    5353msgstr ""
    5454
    55 #: holiday-manager/python3-holidaymanager/HolidayBox.py:513
     55#: holiday-manager/python3-holidaymanager/HolidayBox.py:577
    5656msgid "Changes apply succesfully"
    5757msgstr ""
    5858
    59 #: holiday-manager/python3-holidaymanager/HolidayBox.py:515
     59#: holiday-manager/python3-holidaymanager/HolidayBox.py:579
    6060msgid "Error saving changes"
    6161msgstr ""
    6262
    63 #: holiday-manager/python3-holidaymanager/HolidayBox.py:517
     63#: holiday-manager/python3-holidaymanager/HolidayBox.py:581
    6464msgid "List of dates imported successfully"
    6565msgstr ""
    6666
    67 #: holiday-manager/python3-holidaymanager/HolidayBox.py:519
     67#: holiday-manager/python3-holidaymanager/HolidayBox.py:583
    6868msgid "Unabled to import list. List blocked for other user"
    6969msgstr ""
    7070
    71 #: holiday-manager/python3-holidaymanager/HolidayBox.py:521
     71#: holiday-manager/python3-holidaymanager/HolidayBox.py:585
    7272msgid "Error importing the list of dates"
    7373msgstr ""
    7474
    75 #: holiday-manager/python3-holidaymanager/HolidayBox.py:523
     75#: holiday-manager/python3-holidaymanager/HolidayBox.py:587
    7676msgid "The list of dates to be imported does not exist"
    7777msgstr ""
    7878
    79 #: holiday-manager/python3-holidaymanager/HolidayBox.py:525
     79#: holiday-manager/python3-holidaymanager/HolidayBox.py:589
    8080msgid "List of dates exported successfully"
    8181msgstr ""
    8282
    83 #: holiday-manager/python3-holidaymanager/HolidayBox.py:527
     83#: holiday-manager/python3-holidaymanager/HolidayBox.py:591
    8484msgid "Error exporting the list of dates"
    8585msgstr ""
    8686
    87 #: holiday-manager/python3-holidaymanager/HolidayBox.py:529
     87#: holiday-manager/python3-holidaymanager/HolidayBox.py:593
    8888msgid "Last date in range must be major than init date"
    8989msgstr ""
    9090
    91 #: holiday-manager/python3-holidaymanager/HolidayBox.py:531
     91#: holiday-manager/python3-holidaymanager/HolidayBox.py:595
    9292msgid "You must indicate the two dates of range"
    9393msgstr ""
    9494
    95 #: holiday-manager/python3-holidaymanager/HolidayBox.py:533
     95#: holiday-manager/python3-holidaymanager/HolidayBox.py:597
    9696msgid "You must indicate the date"
    9797msgstr ""
     
    130130
    131131#: holiday-manager/python3-holidaymanager/rsrc/holiday-manager.ui:426
    132 msgid "Delete dates"
     132msgid "Clean date range"
    133133msgstr ""
    134134
Note: See TracChangeset for help on using the changeset viewer.