diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2013-05-01 01:36:12 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2013-05-01 01:36:12 +0200 |
| commit | c6f60740cc4ca2db17b415e77008cbc5c347f9d7 (patch) | |
| tree | ad48ba08e5da192c3ebe989211c2ffe0dd67a330 | |
| parent | eaf95f0c22b50c599c5713166fba03c1c13ff644 (diff) | |
| download | tapasboard-c6f60740cc4ca2db17b415e77008cbc5c347f9d7.tar.gz tapasboard-c6f60740cc4ca2db17b415e77008cbc5c347f9d7.zip | |
standarize root forum id to 0 (violating spec)
| -rw-r--r-- | fetchforumsaction.cpp | 9 | ||||
| -rw-r--r-- | i18n/en.qm | bin | 1227 -> 1528 bytes | |||
| -rw-r--r-- | i18n/en.ts | 32 | ||||
| -rw-r--r-- | i18n/es.qm | bin | 1269 -> 1574 bytes | |||
| -rw-r--r-- | i18n/es.ts | 32 |
5 files changed, 67 insertions, 6 deletions
diff --git a/fetchforumsaction.cpp b/fetchforumsaction.cpp index 814ae02..1111957 100644 --- a/fetchforumsaction.cpp +++ b/fetchforumsaction.cpp @@ -56,6 +56,15 @@ void FetchForumsAction::handleFinishedCall() continue; } + if (forum_id < 0) { + qWarning() << "Negative forum_id in" << map; + continue; + } + if (parent_id < 0) { + // Assume this is a root forum + parent_id = 0; + } + query.bindValue(":forum_id", forum_id); query.bindValue(":parent_id", parent_id); query.bindValue(":forum_name", decodeForumText(map["forum_name"])); Binary files differ@@ -14,12 +14,12 @@ <translation>Yesterday</translation> </message> <message> - <location filename="../board.cpp" line="250"/> + <location filename="../board.cpp" line="254"/> <source>Just now</source> <translation>Just now</translation> </message> <message numerus="yes"> - <location filename="../board.cpp" line="252"/> + <location filename="../board.cpp" line="256"/> <source>%n second(s) ago</source> <translation> <numerusform>%n seconds ago</numerusform> @@ -27,7 +27,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../board.cpp" line="255"/> + <location filename="../board.cpp" line="259"/> <source>%n minute(s) ago</source> <translation> <numerusform>%n minute ago</numerusform> @@ -49,6 +49,19 @@ </message> </context> <context> + <name>ForumModel</name> + <message> + <location filename="../forummodel.cpp" line="105"/> + <source>Announcement</source> + <translation>Announcement</translation> + </message> + <message> + <location filename="../forummodel.cpp" line="107"/> + <source>Sticky</source> + <translation>Sticky</translation> + </message> +</context> +<context> <name>NewPostSheet</name> <message> <location filename="../qml/NewPostSheet.qml" line="15"/> @@ -94,4 +107,17 @@ <translation>Write your message here</translation> </message> </context> +<context> + <name>TopicPage</name> + <message> + <location filename="../qml/TopicPage.qml" line="56"/> + <source>Go to first post</source> + <translation>Go to first post</translation> + </message> + <message> + <location filename="../qml/TopicPage.qml" line="60"/> + <source>Go to last post</source> + <translation>Go to last post</translation> + </message> +</context> </TS> Binary files differ@@ -14,12 +14,12 @@ <translation>Ayer</translation> </message> <message> - <location filename="../board.cpp" line="250"/> + <location filename="../board.cpp" line="254"/> <source>Just now</source> <translation>Ahora mismo</translation> </message> <message numerus="yes"> - <location filename="../board.cpp" line="252"/> + <location filename="../board.cpp" line="256"/> <source>%n second(s) ago</source> <translation> <numerusform>hace %n segundo</numerusform> @@ -27,7 +27,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../board.cpp" line="255"/> + <location filename="../board.cpp" line="259"/> <source>%n minute(s) ago</source> <translation> <numerusform>hace %n minuto</numerusform> @@ -49,6 +49,19 @@ </message> </context> <context> + <name>ForumModel</name> + <message> + <location filename="../forummodel.cpp" line="105"/> + <source>Announcement</source> + <translation>Anuncio</translation> + </message> + <message> + <location filename="../forummodel.cpp" line="107"/> + <source>Sticky</source> + <translation>Fijo</translation> + </message> +</context> +<context> <name>NewPostSheet</name> <message> <location filename="../qml/NewPostSheet.qml" line="15"/> @@ -94,4 +107,17 @@ <translation>Escribe tu mensaje aquí</translation> </message> </context> +<context> + <name>TopicPage</name> + <message> + <location filename="../qml/TopicPage.qml" line="56"/> + <source>Go to first post</source> + <translation>Ir al primer mensaje</translation> + </message> + <message> + <location filename="../qml/TopicPage.qml" line="60"/> + <source>Go to last post</source> + <translation>Ir al último mensaje</translation> + </message> +</context> </TS> |