aMule Forum

Please login or register.

Login with username, password and session length
Advanced search  

News:

We're back! (IN POG FORM)

Author Topic: aMule SVN skin bug (localized string in config?)  (Read 4569 times)

gtoso

  • Official MacOSX Packager
  • Full Member
  • ***
  • Karma: 24
  • Offline Offline
  • Posts: 206
aMule SVN skin bug (localized string in config?)
« on: August 29, 2008, 04:01:15 PM »

Hi,
in today aMule SVN (20080829) on Mac OSX Tiger PPC
if I change the skin from the aMule/aMuleGUI preferences in amule.conf/remote.conf
I found:
Skin=Sistema:gnome.zip
instead of:
Skin=System:gnome.zip

My language is Italian...

EDIT:
My previous version was the 20080803 (used for a short time) so I don't know when the problem began :-(

« Last Edit: August 29, 2008, 04:05:27 PM by gtoso »
Logged

skolnick

  • Global Moderator
  • Hero Member
  • *****
  • Karma: 24
  • Offline Offline
  • Posts: 1188
  • CentOS 6 User
Re: aMule SVN skin bug (localized string in config?)
« Reply #1 on: August 30, 2008, 09:01:29 PM »

I do not understand the issue (I use standard english aMule). Does it work now and not before? or it worked before and not now?

Regards.
Logged

GonoszTopi

  • The current man in charge of most things.
  • Administrator
  • Hero Member
  • *****
  • Karma: 169
  • Offline Offline
  • Posts: 2685
Re: aMule SVN skin bug (localized string in config?)
« Reply #2 on: August 31, 2008, 01:18:16 PM »

I'll have a look at it.
Logged
concordia cum veritate

kornell

  • Approved Newbie
  • *
  • Karma: 2
  • Offline Offline
  • Posts: 31
Re: aMule SVN skin bug (localized string in config?)
« Reply #3 on: August 31, 2008, 07:50:28 PM »


I found:
Skin=Sistema:gnome.zip
instead of:
Skin=System:gnome.zip

My language is Italian...



I can confirm this issue in aMule SVN 20080825 (amulegui/remote.conf) on Linux.

Regards

Logged

Stu Redman

  • Administrator
  • Hero Member
  • *****
  • Karma: 214
  • Offline Offline
  • Posts: 3739
  • Engines screaming
Re: aMule SVN skin bug (localized string in config?)
« Reply #4 on: August 31, 2008, 09:13:24 PM »

GonoszTopi, please review 8717 from 21.6.2008.
Logged
The image of mother goddess, lying dormant in the eyes of the dead, the sheaf of the corn is broken, end the harvest, throw the dead on the pyre -- Iron Maiden, Isle of Avalon

gtoso

  • Official MacOSX Packager
  • Full Member
  • ***
  • Karma: 24
  • Offline Offline
  • Posts: 206
Re: aMule SVN skin bug (localized string in config?)
« Reply #5 on: September 03, 2008, 06:42:50 PM »

GonoszTopi, please review 8717 from 21.6.2008.

I don't understand: do you intend 21.8?
I confirm that the bug is present in 20080829 and not in 20080803.

EDIT: For info this bug is NOT present in 2.2.2

I can confirm this issue in aMule SVN 20080825 (amulegui/remote.conf) on Linux.

So the introduction of the bug is from 04 to 25 of August.

I do not understand the issue (I use standard english aMule). Does it work now and not before? or it worked before and not now?

My English is not so good  ::)
Try to change language...

super:~ gtoso$ grep Skin Library/Application\ Support/aMule/amule.conf
[SkinGUIOptions]
Skin=System:kde4.zip

Image 1 and 2, then in log:

2008-09-03 18:30:24: La cartella delle skin 'Sistema:kde4.zip' non esiste
2008-09-03 18:30:24: Error: can't open file 'Sistema:kde4.zip' (error 2: No such file or directory)

super:~ gtoso$ grep Skin Library/Application\ Support/aMule/amule.conf
[SkinGUIOptions]
Skin=Sistema:kde4.zip

Image 3 and 4, then:

2008-09-03 18:34:50: Le répertoire de skins 'Système :kde4.zip' n'existe pas
2008-09-03 18:34:50: Error: can't open file 'Système :kde4.zip' (error 2: No such file or directory)

super:~ gtoso$ grep Skin Library/Application\ Support/aMule/amule.conf
[SkinGUIOptions]
Skin=Système :kde4.zip
super:~ gtoso$

« Last Edit: September 03, 2008, 06:59:21 PM by gtoso »
Logged

Stu Redman

  • Administrator
  • Hero Member
  • *****
  • Karma: 214
  • Offline Offline
  • Posts: 3739
  • Engines screaming
Re: aMule SVN skin bug (localized string in config?)
« Reply #6 on: September 03, 2008, 10:59:15 PM »

GonoszTopi, please review 8717 from 21.6.2008.

I don't understand: do you intend 21.8?
gtoso, are you sure ? My guess is it was introduced at 21.6. :
Code: [Select]
Index: E:/aMule/dev/mytrunk/src/Preferences.cpp
===================================================================
--- E:/aMule/dev/mytrunk/src/Preferences.cpp (revision 8716)
+++ E:/aMule/dev/mytrunk/src/Preferences.cpp (revision 8717)
@@ -811,7 +811,7 @@
  do
  {
  if (skins == true) {
- Filename = wxT("User:") + Filename;
+ Filename = _("User:") + Filename;
  }
  skinSelector->Append(Filename);
  }
@@ -836,7 +836,7 @@
  do
  {
  if (skins == true) {
- Filename = wxT("System:") +  Filename;
+ Filename = _("System:") +  Filename;
  }
  // avoid duplicates for webserver templates
  if (skinSelector->FindString(Filename) == wxNOT_FOUND) {
@@ -847,7 +847,7 @@
  }
 
  if ( skinSelector->GetCount() == 0 ) {
- skinSelector->Append(wxT("no options available"));
+ skinSelector->Append(_("no options available"));
  }
 
  int id = skinSelector->FindString(m_value);
Try reverting the first two changes (turn the _( back to wxT( ) and see if this fixes the problem.
Logged
The image of mother goddess, lying dormant in the eyes of the dead, the sheaf of the corn is broken, end the harvest, throw the dead on the pyre -- Iron Maiden, Isle of Avalon

gtoso

  • Official MacOSX Packager
  • Full Member
  • ***
  • Karma: 24
  • Offline Offline
  • Posts: 206
Re: aMule SVN skin bug (localized string in config?)
« Reply #7 on: September 04, 2008, 12:21:26 AM »

GonoszTopi, please review 8717 from 21.6.2008.

I don't understand: do you intend 21.8?
gtoso, are you sure ? My guess is it was introduced at 21.6. :

-               Filename = wxT("System:") +  Filename;
+               Filename = _("System:") +  Filename;

Mmm it's seems that you are right!
But I'm sure that 20080803 works fine...
Maybe that the Italian translation was incomplete and so it works...

I'll try to compile next SVN reverting this patch, with the exception of this that seems sensible:
skinSelector->Append(_("no options available"));

Logged

gtoso

  • Official MacOSX Packager
  • Full Member
  • ***
  • Karma: 24
  • Offline Offline
  • Posts: 206
Re: aMule SVN skin bug (localized string in config?)
« Reply #8 on: September 04, 2008, 02:20:00 PM »

Thanks Sturedman, bug fixed  :D

SVN 20080904 works fine with this patch:

Code: [Select]
diff -Naur amule-cvs.orig/src/Preferences.cpp amule-cvs/src/Preferences.cpp
--- amule-cvs.orig/src/Preferences.cpp  2008-08-09 22:38:01.000000000 +0200
+++ amule-cvs/src/Preferences.cpp       2008-09-04 03:04:42.000000000 +0200
@@ -836,7 +836,7 @@
                        do
                        {
                                if (m_is_skin) {
-                                       Filename = _("User:") + Filename;
+                                       Filename = wxT("User:") + Filename;
                                }
                                skinSelector->Append(Filename);
                        }
@@ -862,7 +862,7 @@
                        do
                        {
                                if (m_is_skin) {
-                                       Filename = _("System:") +  Filename;
+                                       Filename = wxT("System:") +  Filename;
                                }
                                // avoid duplicates for webserver templates
                                if (skinSelector->FindString(Filename) == wxNOT_FOUND) {
Logged

wuischke

  • Developer
  • Hero Member
  • *****
  • Karma: 183
  • Offline Offline
  • Posts: 4292
Re: aMule SVN skin bug (localized string in config?)
« Reply #9 on: September 04, 2008, 02:39:15 PM »

I'll apply your patch, thanks a lot for the fix to you and Stu!
Logged