Merge lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname into lp:ubuntu/maverick/ibus

[Joel Auterson]

Changed the main menu entry in Ubuntu from "Ibus Preferences" to "Keyboard Input Methods". Also changed description.

[Vish (vish)]

Hi,
Could you also have a look at Bug #423525 , which is also about rewording the dialogue to:

"Keyboard Input Method support (IBus daemon) has not been started. Do you want to start it now? "

[Vish (vish)]

We can probably fix both the bugs in one merge.

[Joel Auterson (joel-auterson)]

I'll fix it once I've worked out what iBus actually does. :P

On 6/29/10, Vish <email address hidden> wrote:
> We can probably fix both the bugs in one merge.
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/28597
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

[Vish (vish)]

> I'll fix it once I've worked out what iBus actually does. :P

Heh yeah , I'v tried to understand it better too , but even in windows such a system is called "Input Method" .

[Joel Auterson (joel-auterson)]

To wikipedia, I suppose...shall I download my previous branch back to
my computer, fix the bug, then push both at once? We could make the
same merge.

Also, when assigning a bug to myself, do I assign it to 100 Papercuts,
the project, or both?

Thanks.

On 6/30/10, Vish <email address hidden> wrote:
>> I'll fix it once I've worked out what iBus actually does. :P
>
> Heh yeah , I'v tried to understand it better too , but even in windows such
> a system is called "Input Method" .
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/28597
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

[Vish (vish)]

> To wikipedia, I suppose...shall I download my previous branch back to
> my computer, fix the bug, then push both at once? We could make the
> same merge.
>
Hmm , looks like http://code.google.com/p/ibus/issues/list is upstream for IBus bugs. Not sure how they prefer , patches or merges. Could you forward the bug to upstream with your patch? Thanks in advance.

> Also, when assigning a bug to myself, do I assign it to 100 Papercuts,
> the project, or both?
>

You can leave the Papercuts tasks assigned. Looks like you are fixing quite a few bugs , so easier to keep track of the bugs you fixed. :)

[Joel Auterson (joel-auterson)]

I only know how to do merges, I don't really understand patches.

On 7/1/10, Vish <email address hidden> wrote:
>> To wikipedia, I suppose...shall I download my previous branch back to
>> my computer, fix the bug, then push both at once? We could make the
>> same merge.
>>
> Hmm , looks like http://code.google.com/p/ibus/issues/list is upstream for
> IBus bugs. Not sure how they prefer , patches or merges. Could you forward
> the bug to upstream with your patch? Thanks in advance.
>
>> Also, when assigning a bug to myself, do I assign it to 100 Papercuts,
>> the project, or both?
>>
>
> You can leave the Papercuts tasks assigned. Looks like you are fixing quite
> a few bugs , so easier to keep track of the bugs you fixed. :)
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/28597
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

[Arne Goetje (arnegoetje)]

1. .po files should be left alone, since you only modified the msgid, but did not adjust the corrponding msgstr. Means, you would introduce translation bugs. The .po files shipped in the package will be updated at package build time.

2. in lines 246 to 266 my eyes caught a string which also needs to be changed. In ubuntu we don't want the users to add those lines to the ~/.bashrc . Instead, users should run System -> Administration -> Language Support and set the "Keyboard input method" to "ibus". Then log out and in again. That's it.

3. I don't think that upstream will accept this patch, since IBus is only one input method framework out of many available. It's us who chose this one to be used as primary input method framework in Ubuntu. Therefore, for other distributions and users, the current strings may make more sense instead of the proposed changes. And usually users who install ibus packages, know what they are dealing with (mostly East Asian users). It's again Ubuntu which ships IBus by default and therefore want to tweak the menu entry and the description.

review: Needs Fixing

[Joel Auterson (joel-auterson)]

So there's no point fixing it if it will never be accepted?

On 7/6/10, Arne Goetje <email address hidden> wrote:
> Review: Needs Fixing
> 1. .po files should be left alone, since you only modified the msgid, but
> did not adjust the corrponding msgstr. Means, you would introduce
> translation bugs. The .po files shipped in the package will be updated at
> package build time.
>
> 2. in lines 246 to 266 my eyes caught a string which also needs to be
> changed. In ubuntu we don't want the users to add those lines to the
> ~/.bashrc . Instead, users should run System -> Administration -> Language
> Support and set the "Keyboard input method" to "ibus". Then log out and in
> again. That's it.
>
> 3. I don't think that upstream will accept this patch, since IBus is only
> one input method framework out of many available. It's us who chose this one
> to be used as primary input method framework in Ubuntu. Therefore, for other
> distributions and users, the current strings may make more sense instead of
> the proposed changes. And usually users who install ibus packages, know what
> they are dealing with (mostly East Asian users). It's again Ubuntu which
> ships IBus by default and therefore want to tweak the menu entry and the
> description.
>
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/29215
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

[Arne Goetje (arnegoetje)]

There is no point sending it upstream! It would still be useful to change those strings in Ubuntu. However the patch needs to be maintained in Ubuntu, then.

> So there's no point fixing it if it will never be accepted?

[Joel Auterson (joel-auterson)]

Um...how do I do that? I only really understand the merge system, I've
never really used patches before.

On 7/7/10, Arne Goetje <email address hidden> wrote:
> There is no point sending it upstream! It would still be useful to change
> those strings in Ubuntu. However the patch needs to be maintained in Ubuntu,
> then.
>
>> So there's no point fixing it if it will never be accepted?
>
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/29215
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

[Vish (vish)]

> Um...how do I do that? I only really understand the merge system, I've
> never really used patches before.
>

Joel,
As Arne mentioned, since this needs fixing in Ubuntu alone[Thanks Arne for clearing that up] you can just submit a merge , with all the changes suggested earlier.

Also ,if you want to know more about merges/patches : https://wiki.ubuntu.com/Bugs/HowToFix

[Joel Auterson (joel-auterson)]

Submit a merge - that's what I did earlier, right? But where was I
supposed to submit it to?

On 7/9/10, Vish <email address hidden> wrote:
>> Um...how do I do that? I only really understand the merge system, I've
>> never really used patches before.
>>
>
> Joel,
> As Arne mentioned, since this needs fixing in Ubuntu alone[Thanks Arne for
> clearing that up] you can just submit a merge , with all the changes
> suggested earlier.
>
> Also ,if you want to know more about merges/patches :
> https://wiki.ubuntu.com/Bugs/HowToFix
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/29215
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

[Vish (vish)]

> Submit a merge - that's what I did earlier, right? But where was I
> supposed to submit it to?

As I was not familiar with IBus package I had requested Arne to comment on the merge. And Arne has reviewed the merge and marked it as "Needs Fixing".

He has mentioned the changes required in the current merge proposal and once they are done we can merge it for Ubuntu.

[Vish (vish)]

> > Submit a merge - that's what I did earlier, right? But where was I
> > supposed to submit it to?
>
> As I was not familiar with IBus package I had requested Arne to comment on the
> merge. And Arne has reviewed the merge and marked it as "Needs Fixing".
>
> He has mentioned the changes required in the current merge proposal and once
> they are done we can merge it for Ubuntu.

ie , just update the merge proposal you have submitted here ,with the suggested fixes

[Andrew (and471)]

I recommend changing

'Allows you to adjust methods for keyboard input'

to

'Adjust methods for keyboard input'

'Allows to' is unecessary, of course the program allows you, what use would a program that didn't 'Allow you to adjust methods for keyboard input' be? :D

[Vish (vish)]

Also , why have the lines been increased?

For Bug #423525 , the reworded has to be:
"Keyboard input methods (IBus daemon) has not been started. Do you want to start it now?"

Not need to add extra info about the program running in the background.

review: Needs Fixing

[Vish (vish)]

In capitals of course :) , as :
"Keyboard Input Methods (IBus daemon) has not been started. Do you want to start it now?"

[lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname]

25. By Joel Auterson on 2010-08-03

Changed according to suggestions.

Unmerged revisions

25. By Joel Auterson on 2010-08-03

Changed according to suggestions.

24. By Joel Auterson <joel@auterson-study> on 2010-07-20

Made changes according to Arne Goetje's specifications:

reset .po files to normal
changed the string between lines 246 and 266

23. By Joel Auterson <joel@auterson-study> on 2010-07-05

Changed message shown when IBus is not running.

22. By Joel Auterson <joel@auterson-study> on 2010-06-27

Changed the name of the program in the menu to "Keyboard Input Methods" and the comment to "Allows you to adjust methods for keyboard input."

=== modified file 'setup/ibus-setup.desktop.in'
--- setup/ibus-setup.desktop.in	2009-10-26 18:55:02 +0000
+++ setup/ibus-setup.desktop.in	2010-08-03 18:09:45 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
-_Name=IBus Preferences
-_GenericName=IBus Preferences
-_Comment=IBus Preferences
+_Name=Keyboard Input Methods
+_GenericName=Keyboard Input Methods
+_Comment=Adjust methods for keyboard input.
 Exec=ibus-setup
 Icon=ibus-setup
 Terminal=false

=== modified file 'setup/main.py'
--- setup/main.py	2009-12-05 18:44:50 +0000
+++ setup/main.py	2010-08-03 18:09:45 +0000
@@ -237,7 +237,7 @@
             # self.__bus.config_add_watch("/panel")
         except:
             while self.__bus == None:
-                message = _("IBus daemon is not started. Do you want to start it now?")
+                message = _("Keyboard Input Methods (IBus Daemon) has not been started. Do you want to start it now?")
                 dlg = gtk.MessageDialog(type = gtk.MESSAGE_QUESTION,
                         buttons = gtk.BUTTONS_YES_NO,
                         message_format = message)
@@ -253,10 +253,7 @@
                 except:
                     continue
                 message = _("IBus has been started! "
-                    "If you can not use IBus, please add below lines in $HOME/.bashrc, and relogin your desktop.\n"
-                    "  export GTK_IM_MODULE=ibus\n"
-                    "  export XMODIFIERS=@im=ibus\n"
-                    "  export QT_IM_MODULE=ibus"
+                    "If you can not use IBus, please run System -> Administration -> Language Support and set the \"Keyboard Input Method\" to \"ibus\", then log out and back in again."
                     )
                 dlg = gtk.MessageDialog(type = gtk.MESSAGE_INFO,
                                         buttons = gtk.BUTTONS_OK,