[PATCH] help: mark common_guides[] as translatable

2013-04-12 Thread Simon Ruderich
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Tue, Apr 02, 2013 at 11:39:51PM +0100, Philip Oakley wrote:
 --- a/help.c
 +++ b/help.c
 @@ -240,6 +241,23 @@ void list_common_cmds_help(void)
   }
  }

 +void list_common_guides_help(void)
 +{
 + int i, longest = 0;
 +
 + for (i = 0; i  ARRAY_SIZE(common_guides); i++) {
 + if (longest  strlen(common_guides[i].name))
 + longest = strlen(common_guides[i].name);
 + }
 +
 + puts(_(The common Git guides are:\n));
 + for (i = 0; i  ARRAY_SIZE(common_guides); i++) {
 + printf(   %s   , common_guides[i].name);
 + mput_char(' ', longest - strlen(common_guides[i].name));
 + puts(_(common_guides[i].help));

common_guides[] is used here, but without N_() not picked up by
xgettext when creating the pot file.

Regards
Simon

 builtin/help.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/builtin/help.c b/builtin/help.c
index 034c36c..062957f 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -419,13 +419,13 @@ static struct {
const char *name;
const char *help;
 } common_guides[] = {
-   { attributes, Defining attributes per path },
-   { glossary, A Git glossary },
-   { ignore, Specifies intentionally untracked files to ignore },
-   { modules, Defining submodule properties },
-   { revisions, Specifying revisions and ranges for Git },
-   { tutorial, A tutorial introduction to Git (for version 1.5.1 or 
newer) },
-   { workflows, An overview of recommended workflows with Git},
+   { attributes, N_(Defining attributes per path) },
+   { glossary, N_(A Git glossary) },
+   { ignore, N_(Specifies intentionally untracked files to ignore) },
+   { modules, N_(Defining submodule properties) },
+   { revisions, N_(Specifying revisions and ranges for Git) },
+   { tutorial, N_(A tutorial introduction to Git (for version 1.5.1 or 
newer)) },
+   { workflows, N_(An overview of recommended workflows with Git) },
 };
 
 static void list_common_guides_help(void)
-- 
1.8.2.481.g0d034d4

-- 
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] help: mark common_guides[] as translatable

2013-04-12 Thread Philip Oakley

From: Simon Ruderich si...@ruderich.org
Sent: Friday, April 12, 2013 2:51 PM

Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Tue, Apr 02, 2013 at 11:39:51PM +0100, Philip Oakley wrote:

--- a/help.c
+++ b/help.c
@@ -240,6 +241,23 @@ void list_common_cmds_help(void)
 }
 }

+void list_common_guides_help(void)
+{
+ int i, longest = 0;
+
+ for (i = 0; i  ARRAY_SIZE(common_guides); i++) {
+ if (longest  strlen(common_guides[i].name))
+ longest = strlen(common_guides[i].name);
+ }
+
+ puts(_(The common Git guides are:\n));
+ for (i = 0; i  ARRAY_SIZE(common_guides); i++) {
+ printf(   %s   , common_guides[i].name);
+ mput_char(' ', longest - strlen(common_guides[i].name));
+ puts(_(common_guides[i].help));


common_guides[] is used here, but without N_() not picked up by
xgettext when creating the pot file.


Yes. I mucked that up when I hacked the generate-cmdlist.sh to create 
this list.


Acked-by: Philip Oakley philipoak...@iee.org

At some point it is on my TODO list to extend the guide list mechanism 
to all the community generated guides (option -gg) by extending the 
command-list.txt file and the shell script.




Regards
Simon

builtin/help.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/builtin/help.c b/builtin/help.c
index 034c36c..062957f 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -419,13 +419,13 @@ static struct {
 const char *name;
 const char *help;
} common_guides[] = {
- { attributes, Defining attributes per path },
- { glossary, A Git glossary },
- { ignore, Specifies intentionally untracked files to ignore },
- { modules, Defining submodule properties },
- { revisions, Specifying revisions and ranges for Git },
- { tutorial, A tutorial introduction to Git (for version 1.5.1 or 
newer) },

- { workflows, An overview of recommended workflows with Git},
+ { attributes, N_(Defining attributes per path) },
+ { glossary, N_(A Git glossary) },
+ { ignore, N_(Specifies intentionally untracked files to 
ignore) },

+ { modules, N_(Defining submodule properties) },
+ { revisions, N_(Specifying revisions and ranges for Git) },
+ { tutorial, N_(A tutorial introduction to Git (for version 1.5.1 
or newer)) },
+ { workflows, N_(An overview of recommended workflows with 
Git) },

};

static void list_common_guides_help(void)
--
1.8.2.481.g0d034d4

--
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9


--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html