Merge lp:~dano6/podbird/podbird into lp:podbird

Proposed by Daniel Kutka on 2020-04-13
Status: Merged
Merged at revision: 200
Proposed branch: lp:~dano6/podbird/podbird
Merge into: lp:podbird
Diff against target: 230 lines (+63/-37)
2 files modified
app/ui/SearchPage.qml (+1/-0)
po/com.mikeasoft.podbird.pot (+62/-37)
To merge this branch: bzr merge lp:~dano6/podbird/podbird
Reviewer Review Type Date Requested Status
Michael Sheldon 2020-04-13 Pending
Review via email: mp+382136@code.launchpad.net

Description of the change

Revision 198 implemented https://bugs.launchpad.net/podbird/+bug/1725386 too, but subscribe button didn't respond visually, this should fix it. And I forget to update pot file.

To post a comment you must log in.
lp:~dano6/podbird/podbird updated on 2020-04-14
200. By Michael Sheldon on 2020-04-14

Merge Daniel's fixes for:

* Updating POT file
* Fixing subscribe button

Michael Sheldon (michael-sheldon) wrote :

Merged, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/SearchPage.qml'
2--- app/ui/SearchPage.qml 2020-04-09 10:53:12 +0000
3+++ app/ui/SearchPage.qml 2020-04-13 20:16:04 +0000
4@@ -307,6 +307,7 @@
5 }
6 });
7 }
8+ model.subscribed=!model.subscribed;
9 }
10 }
11 }
12
13=== modified file 'po/com.mikeasoft.podbird.pot'
14--- po/com.mikeasoft.podbird.pot 2020-03-25 14:36:39 +0000
15+++ po/com.mikeasoft.podbird.pot 2020-04-13 20:16:04 +0000
16@@ -8,7 +8,7 @@
17 msgstr ""
18 "Project-Id-Version: \n"
19 "Report-Msgid-Bugs-To: \n"
20-"POT-Creation-Date: 2020-03-25 12:20+0000\n"
21+"POT-Creation-Date: 2020-04-13 18:20+0000\n"
22 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
23 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
24 "Language-Team: LANGUAGE <LL@li.org>\n"
25@@ -24,9 +24,9 @@
26 msgid "Episodes"
27 msgstr ""
28
29-#: ../app/components/TabsList.qml:37 ../app/ui/SearchPage.qml:41
30+#: ../app/components/TabsList.qml:37 ../app/ui/SearchPage.qml:43
31 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/components/TabsList.qml:37
32-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:41
33+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:43
34 msgid "Add New Podcasts"
35 msgstr ""
36
37@@ -209,10 +209,10 @@
38 msgstr ""
39
40 #: ../app/ui/EpisodesPage.qml:70 ../app/ui/EpisodesPage.qml:306
41-#: ../app/ui/SearchPage.qml:275
42+#: ../app/ui/SearchPage.qml:290
43 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:70
44 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:306
45-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:275
46+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:290
47 msgid "Unsubscribe"
48 msgstr ""
49
50@@ -281,10 +281,10 @@
51 msgid "Are you sure you want to unsubscribe from <b>%1</b>?"
52 msgstr ""
53
54-#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:130
55+#: ../app/ui/EpisodesPage.qml:323 ../app/ui/SearchPage.qml:144
56 #: ../app/ui/SettingsPage.qml:85 ../app/ui/SettingsPage.qml:120
57 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:323
58-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:130
59+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:144
60 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:85
61 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:120
62 msgid "Cancel"
63@@ -297,10 +297,10 @@
64 msgstr ""
65
66 #: ../app/ui/EpisodesPage.qml:356 ../app/ui/EpisodesTab.qml:418
67-#: ../app/ui/SearchPage.qml:179 ../app/ui/SettingsPage.qml:320
68+#: ../app/ui/SearchPage.qml:194 ../app/ui/SettingsPage.qml:320
69 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesPage.qml:356
70 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/EpisodesTab.qml:418
71-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:179
72+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:194
73 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SettingsPage.qml:320
74 msgid "Close"
75 msgstr ""
76@@ -474,6 +474,11 @@
77 msgid "+%1s"
78 msgstr ""
79
80+#: ../app/ui/ImportPage.qml:18
81+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/ImportPage.qml:18
82+msgid "Choose"
83+msgstr ""
84+
85 #: ../app/ui/NowPlayingPage.qml:34
86 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/NowPlayingPage.qml:34
87 msgid "Now Playing"
88@@ -489,11 +494,11 @@
89 msgid "Queue"
90 msgstr ""
91
92-#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:55
93-#: ../app/ui/SearchPage.qml:161
94+#: ../app/ui/PodcastsTab.qml:57 ../app/ui/SearchPage.qml:57
95+#: ../app/ui/SearchPage.qml:176
96 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:57
97-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:55
98-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:161
99+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:57
100+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:176
101 msgid "Search Podcast"
102 msgstr ""
103
104@@ -507,9 +512,9 @@
105 msgid "No Podcast Subscriptions"
106 msgstr ""
107
108-#: ../app/ui/PodcastsTab.qml:127 ../app/ui/SearchPage.qml:207
109+#: ../app/ui/PodcastsTab.qml:127 ../app/ui/SearchPage.qml:222
110 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:127
111-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:207
112+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:222
113 msgid "No Podcasts Found"
114 msgstr ""
115
116@@ -520,9 +525,9 @@
117 "page to add some."
118 msgstr ""
119
120-#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:209
121+#: ../app/ui/PodcastsTab.qml:129 ../app/ui/SearchPage.qml:224
122 #: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/PodcastsTab.qml:129
123-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:209
124+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:224
125 msgid "No podcasts found matching the search term."
126 msgstr ""
127
128@@ -534,62 +539,82 @@
129 msgstr[0] ""
130 msgstr[1] ""
131
132-#: ../app/ui/SearchPage.qml:63
133-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:63
134+#: ../app/ui/SearchPage.qml:65
135+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:65
136 msgid "Add Podcast"
137 msgstr ""
138
139-#: ../app/ui/SearchPage.qml:122
140-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:122
141+#: ../app/ui/SearchPage.qml:73
142+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:73
143+msgid "Import Podcasts"
144+msgstr ""
145+
146+#: ../app/ui/SearchPage.qml:135
147+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:135
148 msgid "Save Podcast"
149 msgstr ""
150
151-#: ../app/ui/SearchPage.qml:149
152-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:149
153+#: ../app/ui/SearchPage.qml:163
154+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:163
155 msgid "Feed URL"
156 msgstr ""
157
158-#: ../app/ui/SearchPage.qml:176
159-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:176
160+#: ../app/ui/SearchPage.qml:191
161+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:191
162 msgid "Unable to subscribe"
163 msgstr ""
164
165-#: ../app/ui/SearchPage.qml:177
166-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:177
167+#: ../app/ui/SearchPage.qml:192
168+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:192
169 msgid "Please check the URL and try again"
170 msgstr ""
171
172-#: ../app/ui/SearchPage.qml:207
173-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:207
174+#: ../app/ui/SearchPage.qml:222
175+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:222
176 msgid "Looking to add a new podcast?"
177 msgstr ""
178
179-#: ../app/ui/SearchPage.qml:208
180-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:208
181+#: ../app/ui/SearchPage.qml:223
182+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:223
183 msgid ""
184 "Click the 'magnifier' at the top to search or the 'plus' button to add by URL"
185 msgstr ""
186
187-#: ../app/ui/SearchPage.qml:275
188-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:275
189+#: ../app/ui/SearchPage.qml:290
190+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:290
191 msgid "Subscribe"
192 msgstr ""
193
194 #. TRANSLATORS: The first argument here is the date of when the podcast was last updated followed by
195 #. the podcast description.
196-#: ../app/ui/SearchPage.qml:313
197-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:313
198+#: ../app/ui/SearchPage.qml:328
199+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:327
200 #, qt-format
201 msgid ""
202 "Last Updated: %1\n"
203 "%2"
204 msgstr ""
205
206-#: ../app/ui/SearchPage.qml:370
207-#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:370
208+#: ../app/ui/SearchPage.qml:385
209+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:384
210 msgid "Not Available"
211 msgstr ""
212
213+#: ../app/ui/SearchPage.qml:499
214+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:498
215+msgid "Please wait"
216+msgstr ""
217+
218+#: ../app/ui/SearchPage.qml:500
219+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:499
220+msgid "Importing podcasts..."
221+msgstr ""
222+
223+#: ../app/ui/SearchPage.qml:518
224+#: ../build/arm-linux-gnueabihf/app/install/share/qml/podbird/ui/SearchPage.qml:517
225+msgid "imported"
226+msgstr ""
227+
228 #. TRANSLATORS: This strings refers to the seeking of the episode playback. Users can set how far they
229 #. want to seek forward when pressing on this button.
230 #: ../app/ui/SettingsPage.qml:65 ../app/ui/SettingsPage.qml:171

Subscribers

People subscribed via source and target branches

to status/vote changes: