Re: Bug#607867: grub-common: shouty "XEN" in menu items

Re: Bug#607867: grub-common: shouty "XEN" in menu items

[Colin Watson]

On Thu, Dec 23, 2010 at 09:23:15AM +0000, Ian Campbell wrote:
> update-grub currently produces menu items like:
> 	'Debian GNU/Linux, with Linux 2.6.32-5-xen-amd64 and XEN 4.0-amd64'
> 
> There is no reason to capitalise Xen in that way and IMHO it looks strange.
> 
> The attached patch switches to:
> 	'Debian GNU/Linux, with Xen 4.0-amd64 and Linux 2.6.32-5-xen-amd64'
> 
> I moved Xen first since I think it makes it clearer that a given menu item
> launches Xen, which is useful information to put up front. Also I found that
> with the long Linux version numbers Debian uses the Xen was very nearly off the
> edge of the screen.

Makes sense to me.  Vladimir, you wrote this script - do you agree?

Could you please provide a ChangeLog entry for upstream?

> Although the string is processed with gettext_quoted it doesn't appear to be
> translated anywhere (or at least I couldn't find where).

I'm not sure about unstable, but at least the version of GRUB in
experimental has translations of messages in util/grub.d/.

> === modified file 'util/grub.d/20_linux_xen.in'
> --- util/grub.d/20_linux_xen.in	2010-12-21 12:49:29 +0000
> +++ util/grub.d/20_linux_xen.in	2010-12-23 09:14:38 +0000
> @@ -60,11 +60,11 @@
>    args="$5"
>    xen_args="$6"
>    if ${recovery} ; then
> -    title="$(gettext_quoted "%s, with Linux %s and XEN %s (recovery mode)")"
> +    title="$(gettext_quoted "%s, with Xen %s and Linux %s (recovery mode)")"
>    else
> -    title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
> +    title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
>    fi
> -  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
> +  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
>    if ! ${recovery} ; then
>        save_default_entry | sed -e "s/^/\t/"
>    fi

Thanks,

-- 
Colin Watson                                       [cjwatson@ubuntu.com]

Re: Bug#607867: grub-common: shouty "XEN" in menu items

[Ian Campbell]

On Thu, 2010-12-23 at 11:56 +0000, Colin Watson wrote:
> Could you please provide a ChangeLog entry for upstream?

Sure. How about:

2010-12-23  Ian Campbell <ijc@hellion.org.uk>
        * util/grub.d/20_linux_xen.in: Correctly capitalize Xen and
        reorder menu item wording to make it clearer that this entry
        will launch Xen.

> > Although the string is processed with gettext_quoted it doesn't appear to be
> > translated anywhere (or at least I couldn't find where).
> 
> I'm not sure about unstable, but at least the version of GRUB in
> experimental has translations of messages in util/grub.d/.

Ah, I was looking in the upstream bzr. In the Debian bzr the only use of
the old string is in po/grub.pot but not in any po/??.po so I don't
think there is any update required here.

Thanks,
Ian.

-- 
Ian Campbell
Current Noise: Nuclear Assault - Brain Death

Banacek's Eighteenth Polish Proverb:
	The hippo has no sting, but the wise man would rather be sat upon
	by the bee.

Re: Bug#607867: grub-common: shouty "XEN" in menu items

[Ian Campbell]

[-- Attachment #1: Type: text/plain, Size: 970 bytes --]

On a related note how about this patch too:

=== modified file 'util/grub.d/20_linux_xen.in'
--- util/grub.d/20_linux_xen.in	2010-12-21 12:49:29 +0000
+++ util/grub.d/20_linux_xen.in	2010-12-23 20:58:19 +0000
@@ -73,10 +73,12 @@
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
   printf '%s\n' "${prepare_boot_cache}"
-  message="$(gettext_printf "Loading Linux %s ..." ${version})"
+  xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
+  lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
   cat << EOF
-	echo	'$message'
+	echo	'$xmessage'
 	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
+	echo	'$lmessage'
 	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then



-- 
Ian Campbell

Journalism will kill you, but it will keep you alive while you're at it.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: Bug#607867: grub-common: shouty "XEN" in menu items

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

On 12/23/2010 10:01 PM, Ian Campbell wrote:
> On a related note how about this patch too:
>   
Could you supply the ChangeLog?
> === modified file 'util/grub.d/20_linux_xen.in'
> --- util/grub.d/20_linux_xen.in	2010-12-21 12:49:29 +0000
> +++ util/grub.d/20_linux_xen.in	2010-12-23 20:58:19 +0000
> @@ -73,10 +73,12 @@
>      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
>    fi
>    printf '%s\n' "${prepare_boot_cache}"
> -  message="$(gettext_printf "Loading Linux %s ..." ${version})"
> +  xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
> +  lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
>    cat << EOF
> -	echo	'$message'
> +	echo	'$xmessage'
>  	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
> +	echo	'$lmessage'
>  	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
>  EOF
>    if test -n "${initrd}" ; then
>
>
>
>   
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>   


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]

Re: Bug#607867: grub-common: shouty "XEN" in menu items

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 2141 bytes --]

On 12/23/2010 12:56 PM, Colin Watson wrote:
> On Thu, Dec 23, 2010 at 09:23:15AM +0000, Ian Campbell wrote:
>   
>> update-grub currently produces menu items like:
>> 	'Debian GNU/Linux, with Linux 2.6.32-5-xen-amd64 and XEN 4.0-amd64'
>>
>> There is no reason to capitalise Xen in that way and IMHO it looks strange.
>>
>> The attached patch switches to:
>> 	'Debian GNU/Linux, with Xen 4.0-amd64 and Linux 2.6.32-5-xen-amd64'
>>
>> I moved Xen first since I think it makes it clearer that a given menu item
>> launches Xen, which is useful information to put up front. Also I found that
>> with the long Linux version numbers Debian uses the Xen was very nearly off the
>> edge of the screen.
>>     
> Makes sense to me.  Vladimir, you wrote this script - do you agree?
>
>   
Ok with me. You can change it in trunk.
> Could you please provide a ChangeLog entry for upstream?
>
>   
>> Although the string is processed with gettext_quoted it doesn't appear to be
>> translated anywhere (or at least I couldn't find where).
>>     
> I'm not sure about unstable, but at least the version of GRUB in
> experimental has translations of messages in util/grub.d/.
>
>   
>> === modified file 'util/grub.d/20_linux_xen.in'
>> --- util/grub.d/20_linux_xen.in	2010-12-21 12:49:29 +0000
>> +++ util/grub.d/20_linux_xen.in	2010-12-23 09:14:38 +0000
>> @@ -60,11 +60,11 @@
>>    args="$5"
>>    xen_args="$6"
>>    if ${recovery} ; then
>> -    title="$(gettext_quoted "%s, with Linux %s and XEN %s (recovery mode)")"
>> +    title="$(gettext_quoted "%s, with Xen %s and Linux %s (recovery mode)")"
>>    else
>> -    title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
>> +    title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
>>    fi
>> -  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
>> +  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
>>    if ! ${recovery} ; then
>>        save_default_entry | sed -e "s/^/\t/"
>>    fi
>>     
> Thanks,
>
>   


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]

Re: Bug#607867: grub-common: shouty "XEN" in menu items

[Colin Watson]

On Sat, Dec 25, 2010 at 01:53:31PM +0100, Vladimir 'φ-coder/phcoder' Serbinenko wrote:
> On 12/23/2010 12:56 PM, Colin Watson wrote:
> > On Thu, Dec 23, 2010 at 09:23:15AM +0000, Ian Campbell wrote:
> >> update-grub currently produces menu items like:
> >> 	'Debian GNU/Linux, with Linux 2.6.32-5-xen-amd64 and XEN 4.0-amd64'
> >>
> >> There is no reason to capitalise Xen in that way and IMHO it looks strange.
> >>
> >> The attached patch switches to:
> >> 	'Debian GNU/Linux, with Xen 4.0-amd64 and Linux 2.6.32-5-xen-amd64'
> >>
> >> I moved Xen first since I think it makes it clearer that a given menu item
> >> launches Xen, which is useful information to put up front. Also I found that
> >> with the long Linux version numbers Debian uses the Xen was very nearly off the
> >> edge of the screen.
> >
> > Makes sense to me.  Vladimir, you wrote this script - do you agree?
> 
> Ok with me. You can change it in trunk.

Thanks.  Ian, I've applied both your patches to trunk (extending your
ChangeLog entry to cover the second as well); they'll be in the next
snapshot.

2010-12-31  Ian Campbell <ijc@hellion.org.uk>

	* util/grub.d/20_linux_xen.in (linux_entry): Correctly capitalize
	Xen and reorder menu item wording to make it clearer that this entry
	will launch Xen.  Print separate messages when loading Xen and
	Linux.

-- 
Colin Watson                                       [cjwatson@ubuntu.com]

Re: Bug#607867: grub-common: shouty "XEN" in menu items

[Ian Campbell]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

On Fri, 2010-12-31 at 22:50 +0000, Colin Watson wrote: 
> Ian, I've applied both your patches to trunk (extending your
> ChangeLog entry to cover the second as well); they'll be in the next
> snapshot.
> 
> 2010-12-31  Ian Campbell <ijc@hellion.org.uk>
> 
> 	* util/grub.d/20_linux_xen.in (linux_entry): Correctly capitalize
> 	Xen and reorder menu item wording to make it clearer that this entry
> 	will launch Xen.  Print separate messages when loading Xen and
> 	Linux.

Awesome. Thanks!

Ian.

-- 
Ian Campbell

Democracy becomes a government of bullies, tempered by editors.
		-- Ralph Waldo Emerson

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]