unity-scope-click

Merge lp:~alecu/unity-scope-click/spanish-departments-rtm into lp:unity-scope-click/rtm-14.09

  1. spanish-departments-rtm
  2. Merge into rtm-14.09
Proposed by Alejandro J. Cura
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 308
Merged at revision: 306
Proposed branch: lp:~alecu/unity-scope-click/spanish-departments-rtm
Merge into: lp:unity-scope-click/rtm-14.09
Diff against target: 196 lines (+174/-1)
2 files modified
data/update_schema.sh (+173/-0)
libclickscope/click/departments-db.cpp (+1/-1)
To merge this branch: bzr merge lp:~alecu/unity-scope-click/spanish-departments-rtm
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+247347@code.launchpad.net

Commit message

Add Spanish translations to the preinstalled departments db

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

Please also bump the schema in void DepartmentsDb::init_db()

review: Needs Fixing
lp:~alecu/unity-scope-click/spanish-departments-rtm updated
307. By Alejandro J. Cura

Increase schema version

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:307
http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-14.09-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-14.09-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-rtm-14.09-ci/9/rebuild

review: Approve (continuous-integration)
lp:~alecu/unity-scope-click/spanish-departments-rtm updated
308. By Alejandro J. Cura

Missing amazon-int store

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:308
http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-14.09-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-14.09-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-rtm-14.09-ci/10/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM, Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/departments.db'
0Binary files data/departments.db 2014-08-18 14:54:00 +0000 and data/departments.db 2015-01-23 01:42:05 +0000 differ0Binary files data/departments.db 2014-08-18 14:54:00 +0000 and data/departments.db 2015-01-23 01:42:05 +0000 differ
=== modified file 'data/update_schema.sh'
--- data/update_schema.sh 2014-08-18 14:36:17 +0000
+++ data/update_schema.sh 2015-01-23 01:42:05 +0000
@@ -149,4 +149,177 @@
149 UPDATE meta SET value='3' WHERE name='version';149 UPDATE meta SET value='3' WHERE name='version';
150 END TRANSACTION;150 END TRANSACTION;
151_UPDATE_TO_VER3151_UPDATE_TO_VER3
152SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
153fi
154
155if [ "x$SCHEMA_VERSION" = "x3" ]
156then
157 sqlite3 "$DBFILE" << _UPDATE_TO_VER4
158 BEGIN TRANSACTION;
159
160 DELETE FROM "deptnames";
161 INSERT INTO "deptnames" VALUES('social-networking','en_US','Social Networking');
162 INSERT INTO "deptnames" VALUES('travel-local','en_US','Travel & Local');
163 INSERT INTO "deptnames" VALUES('reference','en_US','Reference');
164 INSERT INTO "deptnames" VALUES('food-drink','en_US','Food & Drink');
165 INSERT INTO "deptnames" VALUES('communication','en_US','Communication');
166 INSERT INTO "deptnames" VALUES('accessories','en_US','Utilities');
167 INSERT INTO "deptnames" VALUES('science-engineering','en_US','Science & Engineering');
168 INSERT INTO "deptnames" VALUES('personalisation','en_US','Personalisation');
169 INSERT INTO "deptnames" VALUES('education','en_US','Education');
170 INSERT INTO "deptnames" VALUES('productivity','en_US','Productivity');
171 INSERT INTO "deptnames" VALUES('universal-accessaccessibility','en_US','Universal Access/Accessibility');
172 INSERT INTO "deptnames" VALUES('entertainment','en_US','Entertainment');
173 INSERT INTO "deptnames" VALUES('sports','en_US','Sports');
174 INSERT INTO "deptnames" VALUES('health-fitness','en_US','Health & Fitness');
175 INSERT INTO "deptnames" VALUES('weather','en_US','Weather');
176 INSERT INTO "deptnames" VALUES('shopping','en_US','Shopping');
177 INSERT INTO "deptnames" VALUES('finance','en_US','Finance');
178 INSERT INTO "deptnames" VALUES('business','en_US','Business');
179 INSERT INTO "deptnames" VALUES('media-video','en_US','Media & Video');
180 INSERT INTO "deptnames" VALUES('music-audio','en_US','Music & Audio');
181 INSERT INTO "deptnames" VALUES('news-magazines','en_US','News & Magazines');
182 INSERT INTO "deptnames" VALUES('graphics','en_US','Graphics');
183 INSERT INTO "deptnames" VALUES('lifestyle','en_US','Lifestyle');
184 INSERT INTO "deptnames" VALUES('medical','en_US','Medical');
185 INSERT INTO "deptnames" VALUES('developer-tools','en_US','Developer Tools');
186 INSERT INTO "deptnames" VALUES('games','en_US','Games');
187 INSERT INTO "deptnames" VALUES('books-comics','en_US','Books & Comics');
188
189 INSERT INTO "deptnames" VALUES('accessories','ca_ES','Utilitats');
190 INSERT INTO "deptnames" VALUES('accessories','es_ES','Utilidades');
191 INSERT INTO "deptnames" VALUES('accessories','eu_ES','Tresnak');
192 INSERT INTO "deptnames" VALUES('accessories','gl_ES','Utilidades');
193 INSERT INTO "deptnames" VALUES('books-comics','ca_ES','Llibres i còmics');
194 INSERT INTO "deptnames" VALUES('books-comics','es_ES','Libros y cómics');
195 INSERT INTO "deptnames" VALUES('books-comics','eu_ES','Liburuak eta komikiak');
196 INSERT INTO "deptnames" VALUES('books-comics','gl_ES','Libros e cómics');
197 INSERT INTO "deptnames" VALUES('communication','ca_ES','Comunicació');
198 INSERT INTO "deptnames" VALUES('communication','es_ES','Comunicación');
199 INSERT INTO "deptnames" VALUES('communication','eu_ES','Komunikazioa');
200 INSERT INTO "deptnames" VALUES('communication','gl_ES','Comunicación');
201 INSERT INTO "deptnames" VALUES('developer-tools','ca_ES','Eines per a desenvolupadors');
202 INSERT INTO "deptnames" VALUES('developer-tools','es_ES','Herramientas para desarrolladores');
203 INSERT INTO "deptnames" VALUES('developer-tools','eu_ES','Garatzaileentzako tresnak');
204 INSERT INTO "deptnames" VALUES('developer-tools','gl_ES','Ferramentas de desenvolvemento');
205 INSERT INTO "deptnames" VALUES('education','ca_ES','Educació');
206 INSERT INTO "deptnames" VALUES('education','es_ES','Educación');
207 INSERT INTO "deptnames" VALUES('education','eu_ES','Hezkuntza');
208 INSERT INTO "deptnames" VALUES('education','gl_ES','Educación');
209 INSERT INTO "deptnames" VALUES('entertainment','ca_ES','Entreteniment');
210 INSERT INTO "deptnames" VALUES('entertainment','es_ES','Entretenimiento');
211 INSERT INTO "deptnames" VALUES('entertainment','eu_ES','Entretenimendua');
212 INSERT INTO "deptnames" VALUES('entertainment','gl_ES','Lecer');
213 INSERT INTO "deptnames" VALUES('finance','ca_ES','Finances');
214 INSERT INTO "deptnames" VALUES('finance','es_ES','Finanzas');
215 INSERT INTO "deptnames" VALUES('finance','eu_ES','Finantzak');
216 INSERT INTO "deptnames" VALUES('finance','gl_ES','Finanzas');
217 INSERT INTO "deptnames" VALUES('food-drink','ca_ES','Menjar i begudes');
218 INSERT INTO "deptnames" VALUES('food-drink','es_ES','Comida y bebida');
219 INSERT INTO "deptnames" VALUES('food-drink','eu_ES','Jana eta edaria');
220 INSERT INTO "deptnames" VALUES('food-drink','gl_ES','Comida & bebida');
221 INSERT INTO "deptnames" VALUES('games','ca_ES','Jocs');
222 INSERT INTO "deptnames" VALUES('games','es_ES','Juegos');
223 INSERT INTO "deptnames" VALUES('games','eu_ES','Jokoak');
224 INSERT INTO "deptnames" VALUES('games','gl_ES','Xogos');
225 INSERT INTO "deptnames" VALUES('graphics','ca_ES','Gràfics');
226 INSERT INTO "deptnames" VALUES('graphics','es_ES','Gráficos');
227 INSERT INTO "deptnames" VALUES('graphics','eu_ES','Grafikoak');
228 INSERT INTO "deptnames" VALUES('graphics','gl_ES','Gráficos');
229 INSERT INTO "deptnames" VALUES('lifestyle','ca_ES','Estil de vida');
230 INSERT INTO "deptnames" VALUES('lifestyle','es_ES','Estilo de vida');
231 INSERT INTO "deptnames" VALUES('lifestyle','eu_ES','Bizi-estiloa');
232 INSERT INTO "deptnames" VALUES('lifestyle','gl_ES','Estilo de vida');
233 INSERT INTO "deptnames" VALUES('media-video','ca_ES','Multimèdia i vídeo');
234 INSERT INTO "deptnames" VALUES('media-video','es_ES','Multimedia y vídeos');
235 INSERT INTO "deptnames" VALUES('media-video','eu_ES','Multimedia eta bideoak');
236 INSERT INTO "deptnames" VALUES('media-video','gl_ES','Multimedia e vídeo');
237 INSERT INTO "deptnames" VALUES('medical','ca_ES','Medicina');
238 INSERT INTO "deptnames" VALUES('medical','es_ES','Medicina');
239 INSERT INTO "deptnames" VALUES('medical','eu_ES','Osasuna');
240 INSERT INTO "deptnames" VALUES('medical','gl_ES','Medicina');
241 INSERT INTO "deptnames" VALUES('music-audio','ca_ES','Música i àudio');
242 INSERT INTO "deptnames" VALUES('music-audio','es_ES','Música y audio');
243 INSERT INTO "deptnames" VALUES('music-audio','eu_ES','Musika eta audioa');
244 INSERT INTO "deptnames" VALUES('music-audio','gl_ES','Música e son');
245 INSERT INTO "deptnames" VALUES('news-magazines','ca_ES','Notícies i revistes');
246 INSERT INTO "deptnames" VALUES('news-magazines','es_ES','Noticias y revistas');
247 INSERT INTO "deptnames" VALUES('news-magazines','eu_ES','Albisteak eta aldizkariak');
248 INSERT INTO "deptnames" VALUES('news-magazines','gl_ES','Novas e revistas');
249 INSERT INTO "deptnames" VALUES('productivity','ca_ES','Productivitat');
250 INSERT INTO "deptnames" VALUES('productivity','es_ES','Productividad');
251 INSERT INTO "deptnames" VALUES('productivity','eu_ES','Produktibitatea');
252 INSERT INTO "deptnames" VALUES('productivity','gl_ES','Produtividade');
253 INSERT INTO "deptnames" VALUES('reference','ca_ES','Referència');
254 INSERT INTO "deptnames" VALUES('reference','es_ES','Referencia');
255 INSERT INTO "deptnames" VALUES('reference','eu_ES','Erreferentzia');
256 INSERT INTO "deptnames" VALUES('reference','gl_ES','Referencia');
257 INSERT INTO "deptnames" VALUES('science-engineering','ca_ES','Ciència i enginyeria');
258 INSERT INTO "deptnames" VALUES('science-engineering','es_ES','Ciencia e ingeniería');
259 INSERT INTO "deptnames" VALUES('science-engineering','eu_ES','Zientzia eta ingeniaritza');
260 INSERT INTO "deptnames" VALUES('science-engineering','gl_ES','Ciencia e enxeñaría');
261 INSERT INTO "deptnames" VALUES('shopping','ca_ES','Compres');
262 INSERT INTO "deptnames" VALUES('shopping','es_ES','Tiendas');
263 INSERT INTO "deptnames" VALUES('shopping','eu_ES','Erosketak');
264 INSERT INTO "deptnames" VALUES('shopping','gl_ES','Compras');
265 INSERT INTO "deptnames" VALUES('social-networking','ca_ES','Xarxes socials');
266 INSERT INTO "deptnames" VALUES('social-networking','es_ES','Redes sociales');
267 INSERT INTO "deptnames" VALUES('social-networking','eu_ES','Sare sozialak');
268 INSERT INTO "deptnames" VALUES('social-networking','gl_ES','Redes sociais');
269 INSERT INTO "deptnames" VALUES('sports','ca_ES','Esports');
270 INSERT INTO "deptnames" VALUES('sports','es_ES','Deportes');
271 INSERT INTO "deptnames" VALUES('sports','eu_ES','Kirolak');
272 INSERT INTO "deptnames" VALUES('sports','gl_ES','Deportes');
273 INSERT INTO "deptnames" VALUES('travel-local','ca_ES','Viatges i regional');
274 INSERT INTO "deptnames" VALUES('travel-local','es_ES','Viajes y guías');
275 INSERT INTO "deptnames" VALUES('travel-local','eu_ES','Bidaiak eta gidak');
276 INSERT INTO "deptnames" VALUES('travel-local','gl_ES','Viaxes e local');
277 INSERT INTO "deptnames" VALUES('universal-accessaccessibility','ca_ES','Accés universal i accessibilitat');
278 INSERT INTO "deptnames" VALUES('universal-accessaccessibility','es_ES','Acceso universal/accesibilidad');
279 INSERT INTO "deptnames" VALUES('universal-accessaccessibility','eu_ES','Sarbide unibertsala/Erabilerraztasuna');
280 INSERT INTO "deptnames" VALUES('universal-accessaccessibility','gl_ES','Acceso universal/Accesibilidade');
281 INSERT INTO "deptnames" VALUES('weather','ca_ES','El temps');
282 INSERT INTO "deptnames" VALUES('weather','es_ES','Meteorología');
283 INSERT INTO "deptnames" VALUES('weather','eu_ES','Eguraldia');
284 INSERT INTO "deptnames" VALUES('weather','gl_ES','O Tempo');
285
286 DELETE FROM "pkgmap";
287 INSERT INTO "pkgmap" VALUES('com.canonical.cincodias','news-magazines');
288 INSERT INTO "pkgmap" VALUES('com.canonical.elpais','news-magazines');
289 INSERT INTO "pkgmap" VALUES('com.nokia.heremaps','travel-local');
290 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon','shopping');
291 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon-es','shopping');
292 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon-int','shopping');
293 INSERT INTO "pkgmap" VALUES('com.ubuntu.dropping-letters','games');
294 INSERT INTO "pkgmap" VALUES('com.ubuntu.filemanager','accesories');
295 INSERT INTO "pkgmap" VALUES('com.ubuntu.shorts','news-magazines');
296 INSERT INTO "pkgmap" VALUES('com.ubuntu.sudoku','games');
297 INSERT INTO "pkgmap" VALUES('com.ubuntu.telegram','communication');
298 INSERT INTO "pkgmap" VALUES('com.ubuntu.terminal','accesories');
299 INSERT INTO "pkgmap" VALUES('com.zeptolab.cuttherope.free','games');
300 INSERT INTO "pkgmap" VALUES('com.ubuntu.weather','weather');
301 INSERT INTO "pkgmap" VALUES('com.ubuntu.clock','accessories');
302 INSERT INTO "pkgmap" VALUES('com.canonical.payui','accessories');
303 INSERT INTO "pkgmap" VALUES('com.ubuntu.music','music-audio');
304 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-ebay','shopping');
305 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-gmail','communication');
306 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.ken-vandine.pathwind','games');
307 INSERT INTO "pkgmap" VALUES('com.ubuntu.gallery','accessories');
308 INSERT INTO "pkgmap" VALUES('com.ubuntu.camera','accessories');
309 INSERT INTO "pkgmap" VALUES('com.ubuntu.calculator','accessories');
310 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.mzanetti.tagger','accessories');
311 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-facebook','communication');
312 INSERT INTO "pkgmap" VALUES('com.ubuntu.reminders','accessories');
313 INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-twitter','communication');
314 INSERT INTO "pkgmap" VALUES('address-book-app.desktop','accessories');
315 INSERT INTO "pkgmap" VALUES('dialer-app.desktop','communication');
316 INSERT INTO "pkgmap" VALUES('mediaplayer-app.desktop','sound-video');
317 INSERT INTO "pkgmap" VALUES('messaging-app.desktop','communication');
318 INSERT INTO "pkgmap" VALUES('ubuntu-system-settings.desktop','accessories');
319 INSERT INTO "pkgmap" VALUES('webbrowser-app.desktop','communication');
320
321 UPDATE meta SET value='4' WHERE name='version';
322 END TRANSACTION;
323_UPDATE_TO_VER4
324SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
152fi325fi
153326
=== modified file 'libclickscope/click/departments-db.cpp'
--- libclickscope/click/departments-db.cpp 2014-11-19 11:10:14 +0000
+++ libclickscope/click/departments-db.cpp 2015-01-23 01:42:05 +0000
@@ -156,7 +156,7 @@
156 //156 //
157 // note: this will fail due to unique constraint, but that's fine; it's expected to succeed only when new database is created; in other157 // note: this will fail due to unique constraint, but that's fine; it's expected to succeed only when new database is created; in other
158 // cases the version needs to be bumped in the update_schema.sh script.158 // cases the version needs to be bumped in the update_schema.sh script.
159 query.exec("INSERT INTO meta (name, value) VALUES ('version', 3)");159 query.exec("INSERT INTO meta (name, value) VALUES ('version', 4)");
160160
161 if (!db_.commit())161 if (!db_.commit())
162 {162 {

Subscribers

People subscribed via source and target branches