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
1=== modified file 'data/departments.db'
2Binary files data/departments.db 2014-08-18 14:54:00 +0000 and data/departments.db 2015-01-23 01:42:05 +0000 differ
3=== modified file 'data/update_schema.sh'
4--- data/update_schema.sh 2014-08-18 14:36:17 +0000
5+++ data/update_schema.sh 2015-01-23 01:42:05 +0000
6@@ -149,4 +149,177 @@
7 UPDATE meta SET value='3' WHERE name='version';
8 END TRANSACTION;
9 _UPDATE_TO_VER3
10+SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
11+fi
12+
13+if [ "x$SCHEMA_VERSION" = "x3" ]
14+then
15+ sqlite3 "$DBFILE" << _UPDATE_TO_VER4
16+ BEGIN TRANSACTION;
17+
18+ DELETE FROM "deptnames";
19+ INSERT INTO "deptnames" VALUES('social-networking','en_US','Social Networking');
20+ INSERT INTO "deptnames" VALUES('travel-local','en_US','Travel & Local');
21+ INSERT INTO "deptnames" VALUES('reference','en_US','Reference');
22+ INSERT INTO "deptnames" VALUES('food-drink','en_US','Food & Drink');
23+ INSERT INTO "deptnames" VALUES('communication','en_US','Communication');
24+ INSERT INTO "deptnames" VALUES('accessories','en_US','Utilities');
25+ INSERT INTO "deptnames" VALUES('science-engineering','en_US','Science & Engineering');
26+ INSERT INTO "deptnames" VALUES('personalisation','en_US','Personalisation');
27+ INSERT INTO "deptnames" VALUES('education','en_US','Education');
28+ INSERT INTO "deptnames" VALUES('productivity','en_US','Productivity');
29+ INSERT INTO "deptnames" VALUES('universal-accessaccessibility','en_US','Universal Access/Accessibility');
30+ INSERT INTO "deptnames" VALUES('entertainment','en_US','Entertainment');
31+ INSERT INTO "deptnames" VALUES('sports','en_US','Sports');
32+ INSERT INTO "deptnames" VALUES('health-fitness','en_US','Health & Fitness');
33+ INSERT INTO "deptnames" VALUES('weather','en_US','Weather');
34+ INSERT INTO "deptnames" VALUES('shopping','en_US','Shopping');
35+ INSERT INTO "deptnames" VALUES('finance','en_US','Finance');
36+ INSERT INTO "deptnames" VALUES('business','en_US','Business');
37+ INSERT INTO "deptnames" VALUES('media-video','en_US','Media & Video');
38+ INSERT INTO "deptnames" VALUES('music-audio','en_US','Music & Audio');
39+ INSERT INTO "deptnames" VALUES('news-magazines','en_US','News & Magazines');
40+ INSERT INTO "deptnames" VALUES('graphics','en_US','Graphics');
41+ INSERT INTO "deptnames" VALUES('lifestyle','en_US','Lifestyle');
42+ INSERT INTO "deptnames" VALUES('medical','en_US','Medical');
43+ INSERT INTO "deptnames" VALUES('developer-tools','en_US','Developer Tools');
44+ INSERT INTO "deptnames" VALUES('games','en_US','Games');
45+ INSERT INTO "deptnames" VALUES('books-comics','en_US','Books & Comics');
46+
47+ INSERT INTO "deptnames" VALUES('accessories','ca_ES','Utilitats');
48+ INSERT INTO "deptnames" VALUES('accessories','es_ES','Utilidades');
49+ INSERT INTO "deptnames" VALUES('accessories','eu_ES','Tresnak');
50+ INSERT INTO "deptnames" VALUES('accessories','gl_ES','Utilidades');
51+ INSERT INTO "deptnames" VALUES('books-comics','ca_ES','Llibres i còmics');
52+ INSERT INTO "deptnames" VALUES('books-comics','es_ES','Libros y cómics');
53+ INSERT INTO "deptnames" VALUES('books-comics','eu_ES','Liburuak eta komikiak');
54+ INSERT INTO "deptnames" VALUES('books-comics','gl_ES','Libros e cómics');
55+ INSERT INTO "deptnames" VALUES('communication','ca_ES','Comunicació');
56+ INSERT INTO "deptnames" VALUES('communication','es_ES','Comunicación');
57+ INSERT INTO "deptnames" VALUES('communication','eu_ES','Komunikazioa');
58+ INSERT INTO "deptnames" VALUES('communication','gl_ES','Comunicación');
59+ INSERT INTO "deptnames" VALUES('developer-tools','ca_ES','Eines per a desenvolupadors');
60+ INSERT INTO "deptnames" VALUES('developer-tools','es_ES','Herramientas para desarrolladores');
61+ INSERT INTO "deptnames" VALUES('developer-tools','eu_ES','Garatzaileentzako tresnak');
62+ INSERT INTO "deptnames" VALUES('developer-tools','gl_ES','Ferramentas de desenvolvemento');
63+ INSERT INTO "deptnames" VALUES('education','ca_ES','Educació');
64+ INSERT INTO "deptnames" VALUES('education','es_ES','Educación');
65+ INSERT INTO "deptnames" VALUES('education','eu_ES','Hezkuntza');
66+ INSERT INTO "deptnames" VALUES('education','gl_ES','Educación');
67+ INSERT INTO "deptnames" VALUES('entertainment','ca_ES','Entreteniment');
68+ INSERT INTO "deptnames" VALUES('entertainment','es_ES','Entretenimiento');
69+ INSERT INTO "deptnames" VALUES('entertainment','eu_ES','Entretenimendua');
70+ INSERT INTO "deptnames" VALUES('entertainment','gl_ES','Lecer');
71+ INSERT INTO "deptnames" VALUES('finance','ca_ES','Finances');
72+ INSERT INTO "deptnames" VALUES('finance','es_ES','Finanzas');
73+ INSERT INTO "deptnames" VALUES('finance','eu_ES','Finantzak');
74+ INSERT INTO "deptnames" VALUES('finance','gl_ES','Finanzas');
75+ INSERT INTO "deptnames" VALUES('food-drink','ca_ES','Menjar i begudes');
76+ INSERT INTO "deptnames" VALUES('food-drink','es_ES','Comida y bebida');
77+ INSERT INTO "deptnames" VALUES('food-drink','eu_ES','Jana eta edaria');
78+ INSERT INTO "deptnames" VALUES('food-drink','gl_ES','Comida & bebida');
79+ INSERT INTO "deptnames" VALUES('games','ca_ES','Jocs');
80+ INSERT INTO "deptnames" VALUES('games','es_ES','Juegos');
81+ INSERT INTO "deptnames" VALUES('games','eu_ES','Jokoak');
82+ INSERT INTO "deptnames" VALUES('games','gl_ES','Xogos');
83+ INSERT INTO "deptnames" VALUES('graphics','ca_ES','Gràfics');
84+ INSERT INTO "deptnames" VALUES('graphics','es_ES','Gráficos');
85+ INSERT INTO "deptnames" VALUES('graphics','eu_ES','Grafikoak');
86+ INSERT INTO "deptnames" VALUES('graphics','gl_ES','Gráficos');
87+ INSERT INTO "deptnames" VALUES('lifestyle','ca_ES','Estil de vida');
88+ INSERT INTO "deptnames" VALUES('lifestyle','es_ES','Estilo de vida');
89+ INSERT INTO "deptnames" VALUES('lifestyle','eu_ES','Bizi-estiloa');
90+ INSERT INTO "deptnames" VALUES('lifestyle','gl_ES','Estilo de vida');
91+ INSERT INTO "deptnames" VALUES('media-video','ca_ES','Multimèdia i vídeo');
92+ INSERT INTO "deptnames" VALUES('media-video','es_ES','Multimedia y vídeos');
93+ INSERT INTO "deptnames" VALUES('media-video','eu_ES','Multimedia eta bideoak');
94+ INSERT INTO "deptnames" VALUES('media-video','gl_ES','Multimedia e vídeo');
95+ INSERT INTO "deptnames" VALUES('medical','ca_ES','Medicina');
96+ INSERT INTO "deptnames" VALUES('medical','es_ES','Medicina');
97+ INSERT INTO "deptnames" VALUES('medical','eu_ES','Osasuna');
98+ INSERT INTO "deptnames" VALUES('medical','gl_ES','Medicina');
99+ INSERT INTO "deptnames" VALUES('music-audio','ca_ES','Música i àudio');
100+ INSERT INTO "deptnames" VALUES('music-audio','es_ES','Música y audio');
101+ INSERT INTO "deptnames" VALUES('music-audio','eu_ES','Musika eta audioa');
102+ INSERT INTO "deptnames" VALUES('music-audio','gl_ES','Música e son');
103+ INSERT INTO "deptnames" VALUES('news-magazines','ca_ES','Notícies i revistes');
104+ INSERT INTO "deptnames" VALUES('news-magazines','es_ES','Noticias y revistas');
105+ INSERT INTO "deptnames" VALUES('news-magazines','eu_ES','Albisteak eta aldizkariak');
106+ INSERT INTO "deptnames" VALUES('news-magazines','gl_ES','Novas e revistas');
107+ INSERT INTO "deptnames" VALUES('productivity','ca_ES','Productivitat');
108+ INSERT INTO "deptnames" VALUES('productivity','es_ES','Productividad');
109+ INSERT INTO "deptnames" VALUES('productivity','eu_ES','Produktibitatea');
110+ INSERT INTO "deptnames" VALUES('productivity','gl_ES','Produtividade');
111+ INSERT INTO "deptnames" VALUES('reference','ca_ES','Referència');
112+ INSERT INTO "deptnames" VALUES('reference','es_ES','Referencia');
113+ INSERT INTO "deptnames" VALUES('reference','eu_ES','Erreferentzia');
114+ INSERT INTO "deptnames" VALUES('reference','gl_ES','Referencia');
115+ INSERT INTO "deptnames" VALUES('science-engineering','ca_ES','Ciència i enginyeria');
116+ INSERT INTO "deptnames" VALUES('science-engineering','es_ES','Ciencia e ingeniería');
117+ INSERT INTO "deptnames" VALUES('science-engineering','eu_ES','Zientzia eta ingeniaritza');
118+ INSERT INTO "deptnames" VALUES('science-engineering','gl_ES','Ciencia e enxeñaría');
119+ INSERT INTO "deptnames" VALUES('shopping','ca_ES','Compres');
120+ INSERT INTO "deptnames" VALUES('shopping','es_ES','Tiendas');
121+ INSERT INTO "deptnames" VALUES('shopping','eu_ES','Erosketak');
122+ INSERT INTO "deptnames" VALUES('shopping','gl_ES','Compras');
123+ INSERT INTO "deptnames" VALUES('social-networking','ca_ES','Xarxes socials');
124+ INSERT INTO "deptnames" VALUES('social-networking','es_ES','Redes sociales');
125+ INSERT INTO "deptnames" VALUES('social-networking','eu_ES','Sare sozialak');
126+ INSERT INTO "deptnames" VALUES('social-networking','gl_ES','Redes sociais');
127+ INSERT INTO "deptnames" VALUES('sports','ca_ES','Esports');
128+ INSERT INTO "deptnames" VALUES('sports','es_ES','Deportes');
129+ INSERT INTO "deptnames" VALUES('sports','eu_ES','Kirolak');
130+ INSERT INTO "deptnames" VALUES('sports','gl_ES','Deportes');
131+ INSERT INTO "deptnames" VALUES('travel-local','ca_ES','Viatges i regional');
132+ INSERT INTO "deptnames" VALUES('travel-local','es_ES','Viajes y guías');
133+ INSERT INTO "deptnames" VALUES('travel-local','eu_ES','Bidaiak eta gidak');
134+ INSERT INTO "deptnames" VALUES('travel-local','gl_ES','Viaxes e local');
135+ INSERT INTO "deptnames" VALUES('universal-accessaccessibility','ca_ES','Accés universal i accessibilitat');
136+ INSERT INTO "deptnames" VALUES('universal-accessaccessibility','es_ES','Acceso universal/accesibilidad');
137+ INSERT INTO "deptnames" VALUES('universal-accessaccessibility','eu_ES','Sarbide unibertsala/Erabilerraztasuna');
138+ INSERT INTO "deptnames" VALUES('universal-accessaccessibility','gl_ES','Acceso universal/Accesibilidade');
139+ INSERT INTO "deptnames" VALUES('weather','ca_ES','El temps');
140+ INSERT INTO "deptnames" VALUES('weather','es_ES','Meteorología');
141+ INSERT INTO "deptnames" VALUES('weather','eu_ES','Eguraldia');
142+ INSERT INTO "deptnames" VALUES('weather','gl_ES','O Tempo');
143+
144+ DELETE FROM "pkgmap";
145+ INSERT INTO "pkgmap" VALUES('com.canonical.cincodias','news-magazines');
146+ INSERT INTO "pkgmap" VALUES('com.canonical.elpais','news-magazines');
147+ INSERT INTO "pkgmap" VALUES('com.nokia.heremaps','travel-local');
148+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon','shopping');
149+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon-es','shopping');
150+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-amazon-int','shopping');
151+ INSERT INTO "pkgmap" VALUES('com.ubuntu.dropping-letters','games');
152+ INSERT INTO "pkgmap" VALUES('com.ubuntu.filemanager','accesories');
153+ INSERT INTO "pkgmap" VALUES('com.ubuntu.shorts','news-magazines');
154+ INSERT INTO "pkgmap" VALUES('com.ubuntu.sudoku','games');
155+ INSERT INTO "pkgmap" VALUES('com.ubuntu.telegram','communication');
156+ INSERT INTO "pkgmap" VALUES('com.ubuntu.terminal','accesories');
157+ INSERT INTO "pkgmap" VALUES('com.zeptolab.cuttherope.free','games');
158+ INSERT INTO "pkgmap" VALUES('com.ubuntu.weather','weather');
159+ INSERT INTO "pkgmap" VALUES('com.ubuntu.clock','accessories');
160+ INSERT INTO "pkgmap" VALUES('com.canonical.payui','accessories');
161+ INSERT INTO "pkgmap" VALUES('com.ubuntu.music','music-audio');
162+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-ebay','shopping');
163+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-gmail','communication');
164+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.ken-vandine.pathwind','games');
165+ INSERT INTO "pkgmap" VALUES('com.ubuntu.gallery','accessories');
166+ INSERT INTO "pkgmap" VALUES('com.ubuntu.camera','accessories');
167+ INSERT INTO "pkgmap" VALUES('com.ubuntu.calculator','accessories');
168+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.mzanetti.tagger','accessories');
169+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-facebook','communication');
170+ INSERT INTO "pkgmap" VALUES('com.ubuntu.reminders','accessories');
171+ INSERT INTO "pkgmap" VALUES('com.ubuntu.developer.webapps.webapp-twitter','communication');
172+ INSERT INTO "pkgmap" VALUES('address-book-app.desktop','accessories');
173+ INSERT INTO "pkgmap" VALUES('dialer-app.desktop','communication');
174+ INSERT INTO "pkgmap" VALUES('mediaplayer-app.desktop','sound-video');
175+ INSERT INTO "pkgmap" VALUES('messaging-app.desktop','communication');
176+ INSERT INTO "pkgmap" VALUES('ubuntu-system-settings.desktop','accessories');
177+ INSERT INTO "pkgmap" VALUES('webbrowser-app.desktop','communication');
178+
179+ UPDATE meta SET value='4' WHERE name='version';
180+ END TRANSACTION;
181+_UPDATE_TO_VER4
182+SCHEMA_VERSION=$(sqlite3 "$DBFILE" "SELECT value FROM meta WHERE name='version'")
183 fi
184
185=== modified file 'libclickscope/click/departments-db.cpp'
186--- libclickscope/click/departments-db.cpp 2014-11-19 11:10:14 +0000
187+++ libclickscope/click/departments-db.cpp 2015-01-23 01:42:05 +0000
188@@ -156,7 +156,7 @@
189 //
190 // 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
191 // cases the version needs to be bumped in the update_schema.sh script.
192- query.exec("INSERT INTO meta (name, value) VALUES ('version', 3)");
193+ query.exec("INSERT INTO meta (name, value) VALUES ('version', 4)");
194
195 if (!db_.commit())
196 {

Subscribers

People subscribed via source and target branches