Possible fix for locale issue #518

.github/ISSUE_TEMPLATE/ask_question.md

@@ -1,16 +1,12 @@
 ---
-name: "Ask Question \U0001F4A1"
+name: Ask Question 💡
 about: Ask a Tartube related question
-title: ''
 labels: question
-assignees: ''
-
 ---
-
 Thanks for taking the time to ask a question! 
 
 ### Please read the README
 Perhaps your question is answered there
 
 ### The authors are not experts in python, security, youtube-dl, FFmpeg, Debian/RPM packaging or Windows programming
-You are welcome to ask a Tartube-related question, but you might get a better answer in forums where those kinds of expert can be found
+You are welcome to ask a Tartube-related question, but you might get a better answer in forums where those kinds of expert can be found

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,12 +1,10 @@
 ---
-name: "Bug report \U0001F41E"
+name: Bug report 🐞
 about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: ''
-
 ---
-
 Thanks for taking the time to submit a bug report! Please include the following information:
 
 ### What operating system are you using?
@@ -15,5 +13,5 @@ If using MS Windows, are you using Windows 10, Windows 7, or something else?
 ### What version of Tartube are you using?
 In Tartube's main window, click Help > About
 
-### If your bug report is "I can't download this video", please provide a link to the video
-This will save a lot of time!
+###If your bug report is "I can't download this video", please provide a link to the video
+This will save a lot of time!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,16 +1,13 @@
 ---
-name: "Feature Request \U0001F4A1"
+name: Feature Request 💡
 about: Suggest a new idea for the project.
-title: ''
 labels: enhancement
-assignees: ''
-
 ---
-
 Thanks for taking the time to submit a feature request! 
 
 ### Make sure you are using the most recent version of Tartube
 Perhaps your feature request has already been implemented. The most recent version can be downloaded from Github
 
 ### Please read the README
 Perhaps your feature request is already possible
+

README.rst

@@ -68,7 +68,7 @@ For a full list of new features and fixes, see `recent changes <CHANGES>`__.
 
 Stable release: **v2.4.260 (2 Mar 2023)**
 
-Development release: **v2.4.273 (15 Mar 2023)**
+Development release: **v2.4.277 (20 Mar 2023)**
 
 Official packages (also available from the `Github release page <https://github.com/axcore/tartube/releases>`__):
 

VERSION

@@ -1 +1 @@
-2.4.273
+2.4.277

nsis/tartube_install_64bit.nsi

@@ -1,4 +1,4 @@
-# Tartube v2.4.273 installer script for MS Windows
+# Tartube v2.4.277 installer script for MS Windows
 #
 # Copyright (C) 2019-2023 A S Lewis
 #
@@ -294,7 +294,7 @@
 
     ;Name and file
     Name "Tartube"
-    OutFile "install-tartube-2.4.273-64bit.exe"
+    OutFile "install-tartube-2.4.277-64bit.exe"
 
     ;Default installation folder
     InstallDir "$LOCALAPPDATA\Tartube"
@@ -397,7 +397,7 @@ Section "Tartube" SecClient
 #        "Publisher" "A S Lewis"
 #    WriteRegStr HKLM \
 #        "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tartube" \
-#        "DisplayVersion" "2.4.273"
+#        "DisplayVersion" "2.4.277"
 
     # Create uninstaller
     WriteUninstaller "$INSTDIR\Uninstall.exe"

pack/bin/no_download/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.4.273'
-__date__ = '15 Mar 2023'
+__version__ = '2.4.277'
+__date__ = '20 Mar 2023'
 __copyright__ = 'Copyright \xa9 2019-2023 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2023 A S Lewis.

pack/bin/pkg/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.4.273'
-__date__ = '15 Mar 2023'
+__version__ = '2.4.277'
+__date__ = '20 Mar 2023'
 __copyright__ = 'Copyright \xa9 2019-2023 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2023 A S Lewis.

pack/bin/strict/tartube

@@ -44,8 +44,8 @@ import mainapp
 
 # 'Global' variables
 __packagename__ = 'tartube'
-__version__ = '2.4.273'
-__date__ = '15 Mar 2023'
+__version__ = '2.4.277'
+__date__ = '20 Mar 2023'
 __copyright__ = 'Copyright \xa9 2019-2023 A S Lewis'
 __license__ = """
 Copyright \xa9 2019-2023 A S Lewis.

pack/tartube.1

@@ -1,4 +1,4 @@
-.TH man 1 "15 Mar 2023" "2.4.273" "tartube man page"
+.TH man 1 "20 Mar 2023" "2.4.277" "tartube man page"
 .SH NAME
 tartube \- GUI front-end for youtube-dl and yt-dlp
 .SH SYNOPSIS

setup.py

@@ -186,7 +186,7 @@
 # Setup
 setuptools.setup(
     name = 'tartube',
-    version = '2.4.273',
+    version = '2.4.277',
     description = 'GUI front-end for youtube-dl, yt-dlp and other compatible' \
     + ' video downloaders',
     long_description = long_description,

tartube/config.py

@@ -20315,7 +20315,11 @@ def setup_general_application_tab(self, inner_notebook):
         combo2.pack_start(renderer_text, True)
         combo2.add_attribute(renderer_text, 'text', 1)
 
-        if self.app_obj.current_locale is None:
+        # !!! DEBUG
+        # Git 518: User reports .current_locale is set to 'en_MY', but I can't
+        #   reproduce it
+        if self.app_obj.current_locale is None \
+        or not self.app_obj.current_locale in formats.LOCALE_LIST:
             combo2.set_active(0)
         else:
             combo2.set_active(
@@ -22529,8 +22533,8 @@ def setup_windows_drag_tab(self, inner_notebook):
             'toggled',
             self.on_drag_error_separator_button_toggled,
         )
-        
-                
+
+
     def setup_windows_system_tray_tab(self, inner_notebook):
 
         """Called by self.setup_windows_tab().
@@ -26899,7 +26903,7 @@ def setup_output_general_tab(self, inner_notebook):
             '<u>' + _('General preferences') + '</u>',
             0, 0, 1, 1,
         )
-        
+
         self.add_label(grid,
             '<i>' + _(
                 'Applies to Output tab, terminal window and downloader log',
@@ -29884,7 +29888,7 @@ def on_dl_limit_changed(self, entry):
             self.app_obj.set_operation_download_limit(int(text))
 
 
-    def on_drag_error_msg_button_toggled(self, checkbutton): 
+    def on_drag_error_msg_button_toggled(self, checkbutton):
 
         """Called from callback in self.setup_windows_drag_tab().
 
@@ -29905,7 +29909,7 @@ def on_drag_error_msg_button_toggled(self, checkbutton):
             self.app_obj.set_drag_error_msg_flag(False)
 
 
-    def on_drag_error_name_button_toggled(self, checkbutton): 
+    def on_drag_error_name_button_toggled(self, checkbutton):
 
         """Called from callback in self.setup_windows_drag_tab().
 
@@ -29927,7 +29931,7 @@ def on_drag_error_name_button_toggled(self, checkbutton):
             self.app_obj.set_drag_error_name_flag(False)
 
 
-    def on_drag_error_path_button_toggled(self, checkbutton): 
+    def on_drag_error_path_button_toggled(self, checkbutton):
 
         """Called from callback in self.setup_windows_drag_tab().
 
@@ -29949,7 +29953,7 @@ def on_drag_error_path_button_toggled(self, checkbutton):
             self.app_obj.set_drag_error_path_flag(False)
 
 
-    def on_drag_error_separator_button_toggled(self, checkbutton): 
+    def on_drag_error_separator_button_toggled(self, checkbutton):
 
         """Called from callback in self.setup_windows_drag_tab().
 
@@ -29971,7 +29975,7 @@ def on_drag_error_separator_button_toggled(self, checkbutton):
             self.app_obj.set_drag_error_separator_flag(False)
 
 
-    def on_drag_error_source_button_toggled(self, checkbutton): 
+    def on_drag_error_source_button_toggled(self, checkbutton):
 
         """Called from callback in self.setup_windows_drag_tab().
 
@@ -29993,7 +29997,7 @@ def on_drag_error_source_button_toggled(self, checkbutton):
             self.app_obj.set_drag_error_source_flag(False)
 
 
-    def on_drag_msg_button_toggled(self, checkbutton): 
+    def on_drag_msg_button_toggled(self, checkbutton):
 
         """Called from callback in self.setup_windows_drag_tab().
 
@@ -30077,7 +30081,7 @@ def on_drag_path_button_toggled(self, checkbutton):
             self.app_obj.set_drag_video_path_flag(False)
 
 
-    def on_drag_separator_button_toggled(self, checkbutton):  
+    def on_drag_separator_button_toggled(self, checkbutton):
 
         """Called from callback in self.setup_windows_drag_tab().
 

tartube/downloads.py

@@ -3436,7 +3436,7 @@ def do_download(self):
         # ...and the downloader log (if required)
         if app_obj.ytdl_log_system_cmd_flag:
             app_obj.write_downloader_log(' '.join(cmd_list))
-            
+
         # Create a new child process using that command...
         self.create_child_process(cmd_list)
         # ...and set up the PipeReader objects to read from the child process
@@ -4791,7 +4791,7 @@ def confirm_sim_video(self, json_dict):
             app_obj.write_downloader_log(
                 '[' + video_obj.parent_obj.name + '] <' \
                 + _('Simulated download of:') + ' \'' + filename + '\'>',
-            )            
+            )
 
         # If a new media.Video object was created (or if a video whose name is
         #   unknown, now has a name), register the simulated download with
@@ -6075,7 +6075,7 @@ def read_child_process(self):
 
             # Write output to the downloader log (if required)
             if app_obj.ytdl_log_stderr_flag:
-                app_obj.write_downloader_log(data)            
+                app_obj.write_downloader_log(data)
 
         # Either (or both) of STDOUT and STDERR were non-empty
         self.queue.task_done()
@@ -6778,7 +6778,7 @@ def do_download_clips(self):
             # ...and the downloader log (if required)
             if app_obj.ytdl_log_system_cmd_flag:
                 app_obj.write_downloader_log(' '.join(cmd_list))
-            
+
             # Write an additional message in the Output tab, in the same style
             #   as those produced by youtube-dl/FFmpeg (and therefore not
             #   translated)
@@ -7041,7 +7041,7 @@ def do_download_remove_slices(self):
             # ...and the downloader log (if required)
             if app_obj.ytdl_log_system_cmd_flag:
                 app_obj.write_downloader_log(' '.join(cmd_list))
-            
+
             # Write an additional message in the Output tab, in the same style
             #   as those produced by youtube-dl/FFmpeg (and therefore not
             #   translated)
@@ -7210,7 +7210,7 @@ def do_download_remove_slices(self):
                 # ...and the downloader log (if required)
                 if app_obj.ytdl_log_system_cmd_flag:
                     app_obj.write_downloader_log(' '.join(cmd_list))
-                    
+
                 # Create a new child process using that command...
                 self.create_child_process(cmd_list)
                 # ...and set up the PipeReader objects to read from the child
@@ -8036,7 +8036,7 @@ def read_child_process(self):
             # Write output to the downloader log (if required)
             if app_obj.ytdl_log_stderr_flag:
                 app_obj.write_downloader_log(data)
-                
+
         # Either (or both) of STDOUT and STDERR were non-empty
         self.queue.task_done()
         return True
@@ -9293,7 +9293,7 @@ def show_cmd(self, cmd):
         # Display the message in the downloader log, if allowed
         if app_obj.ytdl_log_system_cmd_flag:
             app_obj.write_downloader_log(cmd)
-            
+
 
     def show_msg(self, msg):
 
@@ -9331,7 +9331,7 @@ def show_msg(self, msg):
         # Write the message to the downloader log, if allowed
         if app_obj.ytdl_log_stdout_flag:
             app_obj.write_downloader_log(msg)
-            
+
 
     def show_error(self, msg):
 
@@ -9370,7 +9370,7 @@ def show_error(self, msg):
         # Write the message to the downloader log (if required)
         if app_obj.ytdl_log_stderr_flag:
             app_obj.write_downloader_log(msg)
-               
+
 
     def stop(self):