Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new category "All" for trends search #41

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Add new category "All" for trends search #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 40 additions & 17 deletions translations/ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,31 +623,36 @@
<translation>Выберите регион для поиска трендов</translation>
</message>
<message>
<location filename="../youtubeanalyzer/trends.py" line="121"/>
<location filename="../youtubeanalyzer/trends.py" line="100"/>
<source>All</source>
<translation>Все</translation>
</message>
<message>
<location filename="../youtubeanalyzer/trends.py" line="122"/>
<source>Unable to show trends. Video category is not selected.</source>
<translation>Не удалось показать тренды. Не задана категория видео.</translation>
</message>
<message>
<location filename="../youtubeanalyzer/trends.py" line="134"/>
<location filename="../youtubeanalyzer/trends.py" line="135"/>
<source>Unable to show trends. YouTube API key is not set.
Please set it in the preferences</source>
<translation>Не удалось показать тренды. Не установлен ключ YouTube API. Пожалуйста, установите его в настройках</translation>
</message>
<message>
<location filename="../youtubeanalyzer/trends.py" line="162"/>
<location filename="../youtubeanalyzer/trends.py" line="163"/>
<source>Trends searching failed</source>
<translation>Поиск по трендам завершился с ошибкой</translation>
</message>
</context>
<context>
<name>TrendsWorkspaceFactory</name>
<message>
<location filename="../youtubeanalyzer/trends.py" line="177"/>
<location filename="../youtubeanalyzer/trends.py" line="178"/>
<source>Trends</source>
<translation>Тренды</translation>
</message>
<message>
<location filename="../youtubeanalyzer/trends.py" line="178"/>
<location filename="../youtubeanalyzer/trends.py" line="179"/>
<source>Search trends...</source>
<translation>Поиск трендов...</translation>
</message>
Expand Down Expand Up @@ -694,58 +699,76 @@
<name>VideoDurationChart</name>
<message>
<location filename="../youtubeanalyzer/chart.py" line="106"/>
<source>30s</source>
<translation>30с</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="107"/>
<source>1m</source>
<translation>1м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="108"/>
<source>3m</source>
<translation>3м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="109"/>
<source>5m</source>
<translation>5м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="107"/>
<location filename="../youtubeanalyzer/chart.py" line="110"/>
<source>10m</source>
<translation>10м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="108"/>
<location filename="../youtubeanalyzer/chart.py" line="111"/>
<source>15m</source>
<translation>15м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="109"/>
<location filename="../youtubeanalyzer/chart.py" line="112"/>
<source>20m</source>
<translation>20м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="110"/>
<location filename="../youtubeanalyzer/chart.py" line="113"/>
<source>30m</source>
<translation>30м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="111"/>
<location filename="../youtubeanalyzer/chart.py" line="114"/>
<source>45m</source>
<translation>45м</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="112"/>
<location filename="../youtubeanalyzer/chart.py" line="115"/>
<source>1h</source>
<translation>1ч</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="113"/>
<location filename="../youtubeanalyzer/chart.py" line="116"/>
<source>1,5h</source>
<translation>1,5ч</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="114"/>
<location filename="../youtubeanalyzer/chart.py" line="117"/>
<source>2h</source>
<translation>2ч</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="115"/>
<location filename="../youtubeanalyzer/chart.py" line="118"/>
<source>2+h</source>
<translation>2+ч</translation>
</message>
<message>
<source>3h</source>
<translation>3ч</translation>
<translation type="vanished">3ч</translation>
</message>
<message>
<location filename="../youtubeanalyzer/chart.py" line="116"/>
<source>3+h</source>
<translation>3+ч</translation>
<translation type="vanished">3+ч</translation>
</message>
</context>
</TS>
5 changes: 3 additions & 2 deletions youtubeanalyzer/trends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def load_state(self):
def save_state(self):
super().save_state()
self._settings.set(Settings.TrendsRegion, self._region_combo_box.currentData())
if self._category_combo_box.currentData():
if self._category_combo_box.currentData() is not None:
self._settings.set(Settings.TrendsVideoCategoryId, int(self._category_combo_box.currentData()))

def get_data_name(self):
Expand Down Expand Up @@ -97,6 +97,7 @@ def _update_categories(self):
categories = engine.get_video_categories(region_code, categories_lang)
if len(categories) == 0:
critial_detailed_message(self, app_name, self.tr("Unable to get video categories"), engine.errorDetails)
self._category_combo_box.addItem(self.tr("All"), 0)
for category in categories:
self._category_combo_box.addItem(category.text, category.id)
if self._loaded_category_id is not None:
Expand All @@ -115,7 +116,7 @@ def _on_search_clicked(self):
QApplication.instance().processEvents()

category_id = self._category_combo_box.currentData()
if not category_id:
if category_id is None:
QApplication.restoreOverrideCursor()
self.setDisabled(False)
QMessageBox.critical(self, app_name, self.tr("Unable to show trends. Video category is not selected."))
Expand Down
Loading