From c6f60740cc4ca2db17b415e77008cbc5c347f9d7 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Wed, 1 May 2013 01:36:12 +0200
Subject: standarize root forum id to 0 (violating spec)

---
 fetchforumsaction.cpp |   9 +++++++++
 i18n/en.qm            | Bin 1227 -> 1528 bytes
 i18n/en.ts            |  32 +++++++++++++++++++++++++++++---
 i18n/es.qm            | Bin 1269 -> 1574 bytes
 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"]));
diff --git a/i18n/en.qm b/i18n/en.qm
index 8c5ef2a..af5384b 100644
Binary files a/i18n/en.qm and b/i18n/en.qm differ
diff --git a/i18n/en.ts b/i18n/en.ts
index 0a41302..8a350d7 100644
--- a/i18n/en.ts
+++ b/i18n/en.ts
@@ -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>
@@ -48,6 +48,19 @@
         <translation>Mark subforums read</translation>
     </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>
@@ -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>
diff --git a/i18n/es.qm b/i18n/es.qm
index c98f21d..d4af107 100644
Binary files a/i18n/es.qm and b/i18n/es.qm differ
diff --git a/i18n/es.ts b/i18n/es.ts
index fc6cb9d..1810ae7 100644
--- a/i18n/es.ts
+++ b/i18n/es.ts
@@ -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>
@@ -48,6 +48,19 @@
         <translation>Marcar subforos como leídos</translation>
     </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>
@@ -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>
-- 
cgit v1.2.3