Commit d2725354 authored by David Bruce's avatar David Bruce

Work on some Windows-specific problems with word list editor



git-svn-id: svn://svn.debian.org/svn/tux4kids/tuxtype/trunk@1633 47d30e19-490b-0410-9d18-e851f4e465b3
parent dbf5fd07
......@@ -45,9 +45,11 @@ uninstall-local:
# on upgrade?:
install-data-hook:
$(MKDIR_P) -m 777 $(DESTDIR)$(pkglocalstatedir)
$(MKDIR_P) -m 777 $(DESTDIR)$(pkglocalstatedir)/words
$(MKDIR_P) -m 777 $(DESTDIR)$(pkgsysconfdir)
uninstall-hook:
rm -rf $(DESTDIR)$(pkglocalstatedir)/words
rm -rf $(DESTDIR)$(pkglocalstatedir)
rm -rf $(DESTDIR)$(pkgsysconfdir)
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-08-22 12:36+0530\n"
"Last-Translator: Amitakhya Phukan <aphukan@redhat.com>\n"
"Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2007-11-10 16:36+0100\n"
"Last-Translator: JardaK <krejci@zstenis.com>\n"
"Language-Team: czech <cs@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2003-05-08 17:58+0200\n"
"Last-Translator: Nikolai Beier <beier@ofir.dk>\n"
"Language-Team: Danish\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2003-06-14 19:00+0000\n"
"Last-Translator: Andreas Ramm <ace1@gmx.net>\n"
"Language-Team: German\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -31,8 +31,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype 1.8.0\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"PO-Revision-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2009-11-04 20:30-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
......
......@@ -28,8 +28,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype 1.8.0\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"PO-Revision-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2009-11-04 20:30-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2009-06-24 22:05+0100\n"
"Last-Translator: Caroline Ford <caroline.ford.work@googlemail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2007-09-16 19:00+0000\n"
"Last-Translator: Amaya Rodrigo <amaya@debian.org>\n"
"Language-Team: Spanish\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2009-02-04 14:55+0100\n"
"Last-Translator: Loïc Martin <loic.martin3@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-08-28 16:17+0530\n"
"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
"Language-Team: Gujarati\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-08-28 16:08+0530\n"
"Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
"Language-Team: Hindi <hindi.sf.net>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-08-27 13:58+0530\n"
"Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
"Language-Team: Kannada <en@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2004-10-20\n"
"Last-Translator: Gintautas Grigas <grigas@ktl.mii.lt>\n"
"Language-Team: Lithuanian\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2005-10-20 21:24+0200\n"
"Last-Translator: Trond Mæhlum <trondm@skolelinux.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2005-02-12 13:13+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-08-27 17:56+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
"Language-Team: Oriya\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2009-09-12 00:14+0100\n"
"Last-Translator: admin <pedro.fragoso@caixamagica.pt>\n"
"Language-Team: <pt@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Mobin M <mobinmohan@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype2\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-12-02 19:51+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-08-22 12:41+0530\n"
"Last-Translator: Felix I <ifelix25@gmail.com>, 2008\n"
"Language-Team: <en@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tuxtype\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-08-28 17:58+0530\n"
"Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
"Language-Team: Telugu <en@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2008-12-11 15:08+0200\n"
"Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tux Typing 1.5.16\n"
"Report-Msgid-Bugs-To: tux4kids-tuxtype-dev@lists.alioth.debian.org\n"
"POT-Creation-Date: 2009-10-27 12:49-0500\n"
"POT-Creation-Date: 2009-11-04 20:30-0600\n"
"PO-Revision-Date: 2007-09-25 09:50-0000\n"
"Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet@anafa."
"org>\n"
......
......@@ -64,7 +64,7 @@ void ChooseListToEdit(void)
DIR* lists_dir = NULL;
struct dirent* list_dirent = NULL;
DEBUGCODE { fprintf(stderr , "%s", settings.var_data_path); }
DEBUGCODE { fprintf(stderr , "%s/words", settings.var_data_path); }
/* First part - scan through our word list directory and create lists */
......@@ -74,7 +74,7 @@ void ChooseListToEdit(void)
//Try to open directory for modifiable word lists:
sprintf(fn , "%s" , settings.var_data_path);
sprintf(fn , "%s/words" , settings.var_data_path);
lists_dir = opendir(fn);
if (!lists_dir)
......@@ -98,7 +98,14 @@ void ChooseListToEdit(void)
if (strcmp("CVS", list_dirent->d_name) == 0)
continue;
snprintf(fn, FNLEN, "%s/%s" , settings.var_data_path, list_dirent->d_name);
/* must have at least .txt at the end */
if (strlen(list_dirent->d_name) < 5)
continue;
if (strcmp(&list_dirent->d_name[strlen(list_dirent->d_name) -4 ],".txt"))
continue;
snprintf(fn, FNLEN, "%s/words/%s" , settings.var_data_path, list_dirent->d_name);
/* CheckFile() returns 2 if dir, 1 if file, 0 if neither: */
if (CheckFile(fn) == 1)
......@@ -315,7 +322,7 @@ void ChooseListToEdit(void)
{
num_lists = 0;
//Try to open directory for modifiable word lists:
sprintf(fn , "%s" , settings.var_data_path);
sprintf(fn , "%s/words" , settings.var_data_path);
lists_dir = opendir(fn);
if (!lists_dir)
......@@ -338,7 +345,7 @@ void ChooseListToEdit(void)
if (strcmp("CVS", list_dirent->d_name) == 0)
continue;
snprintf(fn, FNLEN, "%s/%s" , settings.var_data_path, list_dirent->d_name);
snprintf(fn, FNLEN, "%s/words/%s" , settings.var_data_path, list_dirent->d_name);
/* CheckFile() returns 2 if dir, 1 if file, 0 if neither: */
if (CheckFile(fn) == 1)
......@@ -493,7 +500,7 @@ void EditWordList(char* words_file)
//We should be able to use GenerateWordList() in place of this next block:
//NOTE: Works originally, but upon returning to editorlist, the word selected
// is not there, since all words in the wordlist are deleted
sprintf(fn , "%s/%s", settings.var_data_path, words_file);
sprintf(fn , "%s/words/%s", settings.var_data_path, words_file);
fp = fopen(fn,"r");
number_of_words = 0;
while(!feof(fp))
......@@ -1113,7 +1120,7 @@ int CreateNewWordList(void)
/* Creating file, if possible */
if (save == 1)
{
sprintf(fn, "%s/%s.txt", settings.var_data_path, wordlist);
sprintf(fn, "%s/words/%s.txt", settings.var_data_path, wordlist);
DEBUGCODE{ fprintf(stderr, "File to be saved: %s\n", fn); }
fp = fopen(fn, "a+");
......@@ -1248,7 +1255,7 @@ int RemoveList(char* words_file)
char fn[FNLEN];
LOG("Enter RemoveList()\n");
sprintf(fn , "%s/%s" , settings.var_data_path, words_file);
sprintf(fn , "%s/words/%s" , settings.var_data_path, words_file);
DEBUGCODE{ fprintf(stderr, "Remove file %s\n", fn); }
......
......@@ -1284,7 +1284,7 @@ static int chooseWordlist(void)
/* Adding custom wordlists */
sprintf(wordPath,"%s", settings.var_data_path);
sprintf(wordPath,"%s/words", settings.var_data_path);
if (!CheckFile(wordPath))
{
fprintf(stderr, "chooseWordList() - data path contains no wordlist dir \n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment