Re: use same numbers for pager(responses) and thread(articles) view

Rado S <[email protected]> Thu, 31 May 2007 18:29:40 +0200
Newsgroups gmane.network.tin.devel
Message-ID <[email protected]> 
=- Urs Janßen wrote on Sun 27.May'07 at 17:48:49 +0200 -=

> it doesn't matter if they deal with the same stuff - using a
> different numbering in some levels is inconsistent.
> 
> > If you prefer, we can make all lists begin with 0 or 1, but still
> > keep the relationship between numbers typed in thread and pager.
> 
> humans tend to start counting with 1.

Ok, better now?

Note: I don't know how to deal with the src/po stuff properly.
 If what I did was bad, tell me better ways.

-- 
© Rado S. -- You must provide YOUR effort for your goal!
EVERY effort counts: at least to show your attitude.
You're responsible for ALL you do: you get what you give.
samenumber.pat (text/plain, 12 KB) 
diff -ur torg/include/extern.h tgo/include/extern.h
--- torg/include/extern.h	Tue Mar 27 20:25:48 2007
+++ tgo/include/extern.h	Thu May 31 17:21:46 2007
@@ -440,6 +440,7 @@
 extern constext txt_art_rejected[];
 extern constext txt_art_thread_regex_tag[];
 extern constext txt_art_unavailable[];
+extern constext txt_art_x_of_n[];
 extern constext txt_article_cancelled[];
 extern constext txt_article_plural[];
 extern constext txt_article_reposted[];
@@ -975,7 +976,6 @@
 extern constext txt_range_invalid[];
 extern constext txt_read_abort[];
 extern constext txt_read_exit[];
-extern constext txt_read_resp[];
 extern constext txt_reading_article[];
 extern constext txt_reading_arts[];
 extern constext txt_reading_attributes_file[];
@@ -1004,7 +1004,6 @@
 extern constext txt_reset_newsrc[];
 extern constext txt_resp_redirect[];
 extern constext txt_resp_to_poster[];
-extern constext txt_resp_x_of_n[];
 extern constext txt_return_key[];
 extern constext txt_save[];
 extern constext txt_save_attachment[];
diff -ur torg/po/de.po tgo/po/de.po
--- torg/po/de.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/de.po	Thu May 31 17:56:40 2007
@@ -449,6 +449,10 @@
 msgid	"Article undeleted."
 msgstr	"Artikel löschen rückgängig gemacht."
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	"Art. %4d von %4d"
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	"Artikel"
@@ -2627,10 +2631,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Wollen Sie tin augenblicklich verlassen?"
 
-#: src/lang.c:608
-msgid	"Read response> "
-msgstr	"Lese Antwort> "
-
 #: src/lang.c:609
 msgid	"Reading ('q' to quit)..."
 msgstr	"Lesen ('q' zum Beenden)..."
@@ -2731,11 +2731,6 @@
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"Antwort per Mail wurde angefordert. %s=Mail, %s=post, %s=beenden: "
-
-#: src/lang.c:634
-#, c-format
-msgid	"RespNo %4d of %4d"
-msgstr	"Antw. %4d von %4d"
 
 #: src/lang.c:635
 msgid	"Press <RETURN> to continue..."
diff -ur torg/po/en_GB.po tgo/po/en_GB.po
--- torg/po/en_GB.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/en_GB.po	Thu May 31 17:56:52 2007
@@ -386,6 +386,10 @@
 msgid	"Article undeleted."
 msgstr	""
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	""
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	""
@@ -2443,10 +2447,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	""
 
-#: src/lang.c:608
-msgid	"Read response> "
-msgstr	""
-
 #: src/lang.c:609
 msgid	"Reading ('q' to quit)..."
 msgstr	""
@@ -2546,11 +2546,6 @@
 #: src/lang.c:633
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
-msgstr	""
-
-#: src/lang.c:634
-#, c-format
-msgid	"RespNo %4d of %4d"
 msgstr	""
 
 #: src/lang.c:635
diff -ur torg/po/et.po tgo/po/et.po
--- torg/po/et.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/et.po	Thu May 31 17:57:27 2007
@@ -397,6 +397,10 @@
 msgid	"Article undeleted."
 msgstr	"Artikkel taastatud."
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	"Art. %4d : %4d"
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	"artiklit"
@@ -2562,10 +2566,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Kas soovite viivitamata tinist väljuda?"
 
-#: src/lang.c:608
-msgid	"Read response> "
-msgstr	"Loen vastust> "
-
 #: src/lang.c:609
 msgid	"Reading ('q' to quit)..."
 msgstr	"Loen ('q' katkestamiseks)..."
@@ -2666,11 +2666,6 @@
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"Vastused edastatakse postitajale. %s=kirjuta, %s=postita, %s=välju: "
-
-#: src/lang.c:634
-#, c-format
-msgid	"RespNo %4d of %4d"
-msgstr	"Vastus %4d : %4d"
 
 #: src/lang.c:635
 msgid	"Press <RETURN> to continue..."
diff -ur torg/po/fr.po tgo/po/fr.po
--- torg/po/fr.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/fr.po	Thu May 31 17:57:53 2007
@@ -396,6 +396,10 @@
 msgid	"Article undeleted."
 msgstr	"Article non effacé."
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	"Art. %4d sur %4d"
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	"articles"
@@ -2588,10 +2592,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Voulez-vous quitter tin immédiatement ?"
 
-#: src/lang.c:608
-msgid	"Read response> "
-msgstr	"Lire la réponse> "
-
 #: src/lang.c:609
 msgid	"Reading ('q' to quit)..."
 msgstr	"Lecture ('q' pour quitter)..."
@@ -2693,11 +2693,6 @@
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"Les réponses ont été redirigées à l'auteur. %s=mail, %s=poster, %s=quitter : "
-
-#: src/lang.c:634
-#, c-format
-msgid	"RespNo %4d of %4d"
-msgstr	"Réponse %4d sur %4d"
 
 #: src/lang.c:635
 msgid	"Press <RETURN> to continue..."
diff -ur torg/po/ru.po tgo/po/ru.po
--- torg/po/ru.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/ru.po	Thu May 31 18:00:21 2007
@@ -394,6 +394,10 @@
 msgid	"Article undeleted."
 msgstr	"óÔÁÔØÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÁ."
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	"óÔÁÔØÑ %4d ÉÚ %4d"
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	"ÓÔÁÔØÉ"
@@ -2527,10 +2531,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	"÷Ù ÈÏÔÉÔÅ ×ÙÊÔÉ ÉÚ tin ÎÅÍÅÄÌÅÎÎÏ?"
 
-#: src/lang.c:608
-msgid	"Read response> "
-msgstr	"ðÒÏÞÉÔÁÔØ ÏÔ×ÅÔ> "
-
 #: src/lang.c:609
 msgid	"Reading ('q' to quit)..."
 msgstr	"þÔÅÎÉÅ ('q' - ×ÙÈÏÄ)..."
@@ -2632,11 +2632,6 @@
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"ïÔ×ÅÔÙ ÂÙÌÉ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÙ ÏÔÐÒÁ×ÉÔÅÌÀ. %s=mail, %s=ÏÔÐÒÁ×ÉÔØ, %s=×ÙÈÏÄ: "
-
-#: src/lang.c:634
-#, c-format
-msgid	"RespNo %4d of %4d"
-msgstr	"ïÔ×ÅÔ %4d ÉÚ %4d"
 
 #: src/lang.c:635
 msgid	"Press <RETURN> to continue..."
diff -ur torg/po/rw.po tgo/po/rw.po
--- torg/po/rw.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/rw.po	Thu May 31 18:00:56 2007
@@ -413,6 +413,10 @@
 msgid	"Article undeleted."
 msgstr	""
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	""
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	""
@@ -2784,10 +2788,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Kuri Gusohoka Ako kanya"
 
-#: src/lang.c:608
-msgid	"Read response> "
-msgstr	""
-
 #: src/lang.c:609
 #, fuzzy
 msgid	"Reading ('q' to quit)..."
@@ -2900,11 +2900,6 @@
 #, fuzzy, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"Kuri Umuteguro Ubutumwa Iposita Kuvamo"
-
-#: src/lang.c:634
-#, fuzzy, c-format
-msgid	"RespNo %4d of %4d"
-msgstr	"Bya"
 
 #: src/lang.c:635
 #, fuzzy
diff -ur torg/po/sv.po tgo/po/sv.po
--- torg/po/sv.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/sv.po	Thu May 31 18:01:16 2007
@@ -392,6 +392,10 @@
 msgid	"Article undeleted."
 msgstr	""
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	""
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	"artiklar"
@@ -2454,10 +2458,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	"Vill du avsluta tin omedelbart?"
 
-#: src/lang.c:608
-msgid	"Read response> "
-msgstr	"Läsa svar> "
-
 #: src/lang.c:609
 msgid	"Reading ('q' to quit)..."
 msgstr	"Läser (\"q\" för att avsluta)..."
@@ -2557,11 +2557,6 @@
 #: src/lang.c:633
 #, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
-msgstr	""
-
-#: src/lang.c:634
-#, c-format
-msgid	"RespNo %4d of %4d"
 msgstr	""
 
 #: src/lang.c:635
diff -ur torg/po/tin.pot tgo/po/tin.pot
--- torg/po/tin.pot	Tue Mar 27 20:25:48 2007
+++ tgo/po/tin.pot	Thu May 31 18:01:29 2007
@@ -396,6 +396,10 @@
 msgid "Article undeleted."
 msgstr ""
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	""
+
 #: src/lang.c:66
 msgid "articles"
 msgstr ""
@@ -2509,10 +2513,6 @@
 msgid "Do you want to exit tin immediately?"
 msgstr ""
 
-#: src/lang.c:608
-msgid "Read response> "
-msgstr ""
-
 #: src/lang.c:609
 msgid "Reading ('q' to quit)..."
 msgstr ""
@@ -2612,11 +2612,6 @@
 #: src/lang.c:633
 #, c-format
 msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
-msgstr ""
-
-#: src/lang.c:634
-#, c-format
-msgid "RespNo %4d of %4d"
 msgstr ""
 
 #: src/lang.c:635
diff -ur torg/po/tr.po tgo/po/tr.po
--- torg/po/tr.po	Tue Mar 27 20:25:49 2007
+++ tgo/po/tr.po	Thu May 31 18:01:58 2007
@@ -402,6 +402,10 @@
 msgid	"Article undeleted."
 msgstr	"Makale silinmeden geri alýndý."
 
+#: src/lang.c:65
+msgid	"Art. %4d of %4d"
+msgstr	"Makale %4d von %4d"
+
 #: src/lang.c:66
 msgid	"articles"
 msgstr	"makaleler"
@@ -2887,11 +2891,6 @@
 msgid	"Do you want to exit tin immediately?"
 msgstr	"tin'den hemen çýkmak istediðinizden emin misisniz?"
 
-#: src/lang.c:608
-#, fuzzy
-msgid	"Read response> "
-msgstr	"Yanýtý oku> "
-
 #: src/lang.c:609
 #, fuzzy
 msgid	"Reading ('q' to quit)..."
@@ -3006,11 +3005,6 @@
 #, fuzzy, c-format
 msgid	"Responses have been directed to poster. %s=mail, %s=post, %s=quit: "
 msgstr	"Yanýtlar göndericiye yönlendirildi. %s=postala, %s=gönder, %s=iptal: "
-
-#: src/lang.c:634
-#, fuzzy, c-format
-msgid	"RespNo %4d of %4d"
-msgstr	"YanýtNo %4d of %4d"
 
 #: src/lang.c:635
 #, fuzzy
diff -ur torg/src/lang.c tgo/src/lang.c
--- torg/src/lang.c	Tue Mar 27 20:25:48 2007
+++ tgo/src/lang.c	Thu May 31 17:12:29 2007
@@ -62,6 +62,7 @@
 constext txt_art_thread_regex_tag[] = N_("%s=article, %s=thread, %s=hot, %s=pattern, %s=tagged articles, %s=quit: ");
 constext txt_art_unavailable[] = N_("Article unavailable");
 constext txt_art_undeleted[] = N_("Article undeleted.");
+constext txt_art_x_of_n[] = N_("Art. %4d of %4d");
 constext txt_article_cancelled[] = "Article cancelled by author.\n";
 constext txt_article_plural[] = N_("articles");
 constext txt_article_reposted[] = N_("This is a repost of the following article:");
@@ -605,7 +606,6 @@
 constext txt_range_invalid[] = N_("Invalid range - valid are '0-9.$' eg. 1-$");
 constext txt_read_abort[] = N_("Do you want to abort this operation?");
 constext txt_read_exit[] = N_("Do you want to exit tin immediately?");
-constext txt_read_resp[] = N_("Read response> ");
 constext txt_reading_article[] = N_("Reading ('q' to quit)...");
 constext txt_reading_arts[] = N_("Reading %sarticles...");
 constext txt_reading_attributes_file[] = N_("Reading %sattributes file...\n");
@@ -631,7 +631,7 @@
 constext txt_reset_newsrc[] = N_("Reset newsrc?");
 constext txt_resp_redirect[] = N_("Responses have been directed to the following newsgroups");
 constext txt_resp_to_poster[] = N_("Responses have been directed to poster. %s=mail, %s=post, %s=quit: ");
-constext txt_resp_x_of_n[] = N_("RespNo %4d of %4d");
+
 constext txt_return_key[] = N_("Press <RETURN> to continue...");
 
 constext txt_select_from[] = N_("Select From    [%s] (y/n): ");
--- torg/src/page.c	Tue Mar 27 20:25:48 2007
+++ tgo/src/page.c	Thu May 31 18:16:11 2007
@@ -337,7 +337,6 @@
 			case GLOBAL_ABORT:       /* Abort */
 				break;
 
-			case DIGIT_0:
 			case DIGIT_1:
 			case DIGIT_2:
 			case DIGIT_3:
@@ -1273,7 +1272,7 @@
 #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE)
 	/* convert to wide-char format strings */
 	fmt_thread = char2wchar_t(_(txt_thread_x_of_n));
-	fmt_resp = char2wchar_t(_(txt_resp_x_of_n));
+	fmt_resp = char2wchar_t(_(txt_art_x_of_n));
 
 	/*
 	 * determine the needed space for the text at the right hand margin
@@ -1422,7 +1421,7 @@
 		my_fputc(' ', stdout);
 
 	if (whichresp)
-		my_printf(_(txt_resp_x_of_n), whichresp, x_resp);
+		my_printf(_(txt_art_x_of_n), whichresp+1, x_resp+1);
 	else {
 		if (!x_resp)
 			my_printf(_(txt_no_responses));
@@ -1500,7 +1499,7 @@
 	 * the formating info (%4s) needs 3 positions but we need 4 positions
 	 * on the screen for each counter
 	 */
-	right_len = MAX((strlen(_(txt_thread_x_of_n)) - 6 + 8), (strlen(_(txt_resp_x_of_n)) - 6 + 8));
+	right_len = MAX((strlen(_(txt_thread_x_of_n)) - 6 + 8), (strlen(_(txt_art_x_of_n)) - 6 + 8));
 
 	/*
 	 * first line
@@ -1616,7 +1615,7 @@
 		my_fputc(' ', stdout);
 
 	if (whichresp)
-		my_printf(_(txt_resp_x_of_n), whichresp, x_resp);
+		my_printf(_(txt_art_x_of_n), whichresp+1, x_resp+1);
 	else {
 		if (!x_resp)
 			my_printf(_(txt_no_responses));
@@ -1785,7 +1784,7 @@
 
 	clear_message();
 
-	if ((num = prompt_num(ch, _(txt_read_resp))) == -1) {
+	if ((num = (prompt_num(ch, _(txt_select_art))-1)) == -1) {
 		clear_message();
 		return -1;
 	}