chiark / gitweb /
~mdw / disorder / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2992937)
First iteration of login page translation
authorRichard Kettlewell <rjk@greenend.org.uk>
Sat, 17 May 2008 15:41:05 +0000 (16:41 +0100)
committerRichard Kettlewell <rjk@greenend.org.uk>
Sat, 17 May 2008 15:41:05 +0000 (16:41 +0100)
server/macros-disorder.c patch | blob | blame | history
templates/login.tmpl patch | blob | blame | history

diff --git a/server/macros-disorder.c b/server/macros-disorder.c
index c2ac8b082e89c2dfebbba6a6d3f70fa51aa67d50..f8e7fe18a4bc34ee283960cc9e1ce873cf3247bb 100644 (file)
--- a/server/macros-disorder.c
+++ b/server/macros-disorder.c
@@ -26,6 +26,9 @@
 /** @brief For error template */
 char *dcgi_error_string;
 
 /** @brief For error template */
 char *dcgi_error_string;
 
+/** @brief For login template */
+char *dcgi_status_string;
+
 /** @brief Return @p i as a string */
 static const char *make_index(int i) {
   char *s;
 /** @brief Return @p i as a string */
 static const char *make_index(int i) {
   char *s;
@@ -755,7 +758,20 @@ static int exp_error(int attribute((unused)) nargs,
                      char attribute((unused)) **args,
                      struct sink *output,
                      void attribute((unused)) *u) {
                      char attribute((unused)) **args,
                      struct sink *output,
                      void attribute((unused)) *u) {
-  return sink_writes(output, dcgi_error_string) < 0 ? -1 : 0;
+  return sink_writes(output, dcgi_error_string ? dcgi_error_string : "")
+              < 0 ? -1 : 0;
+}
+
+/* @error
+ *
+ * Expands to the latest status string.
+ */
+static int exp_status(int attribute((unused)) nargs,
+                      char attribute((unused)) **args,
+                      struct sink *output,
+                      void attribute((unused)) *u) {
+  return sink_writes(output, dcgi_status_string ? dcgi_status_string : "")
+              < 0 ? -1 : 0;
 }
 
 /* @image{NAME}
 }
 
 /* @image{NAME}
@@ -972,6 +988,7 @@ void dcgi_expansions(void) {
   mx_register("resolve", 1, 1, exp_resolve);
   mx_register("server-version", 0, 0, exp_server_version);
   mx_register("state", 1, 1, exp_state);
   mx_register("resolve", 1, 1, exp_resolve);
   mx_register("server-version", 0, 0, exp_server_version);
   mx_register("state", 1, 1, exp_state);
+  mx_register("status", 0, 0, exp_status);
   mx_register("thisurl", 0, 0, exp_thisurl);
   mx_register("trackstate", 1, 1, exp_trackstate);
   mx_register("transform", 2, 3, exp_transform);
   mx_register("thisurl", 0, 0, exp_thisurl);
   mx_register("trackstate", 1, 1, exp_trackstate);
   mx_register("transform", 2, 3, exp_transform);
diff --git a/templates/login.tmpl b/templates/login.tmpl
index 7c45438d88b4365a740813763fa5b2c33ee02072..24b26be308db509f34dec208a4aea1fe0972acb8 100644 (file)
--- a/templates/login.tmpl
+++ b/templates/login.tmpl
@@ -24,40 +24,38 @@ USA
  </head>
  <body>
 @stdmenu{login}
  </head>
  <body>
 @stdmenu{login}
-   <h1>@label:login.title@</h1>
-
-   @if{@ne{@label:error@}{error}@}{
-   @#{error reporting from some earlier operation}@
-   <div class=error>
-     <p class=error>@label{error.@label:error@}@</p>
-   </div>
-   }@
-
-   @if{@ne{@label:status@}{status}@}{
-   @#{some action succeeded}@
-   <div class=loginstatus>
-     <p>@label{login.@label:status@}@</p>
-   </div>
-   }@
-
-   @if{@eq{@user@}{guest}@}{
-   @#{guest user, allow login and registration}@
+   <h1>@label{login.title}</h1>
+
+@if{@ne{@error}{}}
+   {@# Error reporting from some earlier operation
+     <div class=error>
+       <p class=error>@label{error.@error}</p>
+     </div>}
+
+@if{@ne{@status}{}}
+   {@# Some action succeeded
+     <div class=loginstatus>
+       <p>@label{login.@status}</p>
+     </div>}
+
+@if{@eq{@user}{guest}}
+   {@# Guest user, allow login and registration
    <h2>Existing users</h2>
 
    <p>If you have a username, use this form to log in.</p>
 
    <h2>Existing users</h2>
 
    <p>If you have a username, use this form to log in.</p>
 
-   <form class=login action="@url@" method=POST
+   <form class=login action="@url" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=login>
        <tr>
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=login>
        <tr>
-         <td>@label:login.username@</td>
+         <td>@label{login.username}</td>
          <td>
            <input class=username name=username type=text size=32
          <td>
            <input class=username name=username type=text size=32
-                 value="@arg:username@">
+                 value="@argq{username}">
          </td>
        </tr>
        <tr>
          </td>
        </tr>
        <tr>
-         <td>@label:login.password@</td>
+         <td>@label{login.password}</td>
          <td>
            <input class=password name=password type=password value=""
                   size=32>
          <td>
            <input class=password name=password type=password value=""
                   size=32>
@@ -66,13 +64,13 @@ USA
        <tr>
          <td colspan=2>
            <button class=login name=button type=submit>
        <tr>
          <td colspan=2>
            <button class=login name=button type=submit>
-             @label:login.login@
+             @label{login.login}
            </button>
          </td>
        </tr>
      </table>
      <input name=action type=hidden value=login>
            </button>
          </td>
        </tr>
      </table>
      <input name=action type=hidden value=login>
-     <input name=back type=hidden value="@arg:back@">
+     <input name=back type=hidden value="@argq{back}">
    </form>
 
    <p>If you've forgotten your password, use this form to request an
    </form>
 
    <p>If you've forgotten your password, use this form to request an
@@ -80,20 +78,20 @@ USA
    your email address, and if a reminder has been sent too recently
    then it won't be possible to send one.</p>
 
    your email address, and if a reminder has been sent too recently
    then it won't be possible to send one.</p>
 
-   <form class=reminder action="@url@" method=POST
+   <form class=reminder action="@url" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=login>
        <tr>
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=login>
        <tr>
-         <td>@label:login.username@</td>
+         <td>@label{login.username}</td>
          <td>
            <input class=username name=username type=text size=32
          <td>
            <input class=username name=username type=text size=32
-                 value="@arg:username@">
+                 value="@argq{username}">
          </td>
        </tr>
        <tr>
          <td colspan=2>
            <button class=login name=button type=submit>
          </td>
        </tr>
        <tr>
          <td colspan=2>
            <button class=login name=button type=submit>
-             @label:login.reminder@
+             @label{login.reminder}
            </button>
          </td>
        </tr>
            </button>
          </td>
        </tr>
@@ -109,61 +107,60 @@ USA
    which you must visit to activate your login before you can use
    it.<p>
 
    which you must visit to activate your login before you can use
    it.<p>
 
-   <form class=register action="@url@" method=POST
+   <form class=register action="@url" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=register>
        <tr>
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=register>
        <tr>
-         <td>@label:login.username@</td>
+         <td>@label{login.username}</td>
          <td>
            <input class=username name=username type=text size=32
                  value="">
          </td>
          <td>
            <input class=username name=username type=text size=32
                  value="">
          </td>
-         <td class=extra>@label:login.registerusernameextra@</td>
+         <td class=extra>@label{login.registerusernameextra}</td>
        </tr>
        <tr>
        </tr>
        <tr>
-         <td>@label:login.email@</td>
+         <td>@label{login.email}</td>
          <td>
            <input class=email name=email type=text size=32
                   value="">
          </td>
          <td>
            <input class=email name=email type=text size=32
                   value="">
          </td>
-         <td class=extra>@label:login.registeremailextra@</td>
+         <td class=extra>@label{login.registeremailextra}</td>
        </tr>
        <tr>
        </tr>
        <tr>
-         <td>@label:login.password1@</td>
+         <td>@label{login.password1}</td>
          <td>
            <input class=password name=password1 type=password size=32
                  value="">
          </td>
          <td>
            <input class=password name=password1 type=password size=32
                  value="">
          </td>
-         <td class=extra>@label:login.registerpassword1extra@</td>
+         <td class=extra>@label{login.registerpassword1extra}</td>
        </tr>
        <tr>
        </tr>
        <tr>
-         <td>@label:login.password2@</td>
+         <td>@label{login.password2}</td>
          <td>
            <input class=password name=password2 type=password size=32
                  value="">
          </td>
          <td>
            <input class=password name=password2 type=password size=32
                  value="">
          </td>
-         <td class=extra>@label:login.registerpassword2extra@</td>
+         <td class=extra>@label{login.registerpassword2extra}</td>
        </tr>
        <tr>
          <td colspan=3>
            <button class=register name=button>
        </tr>
        <tr>
          <td colspan=3>
            <button class=register name=button>
-             @label:login.register@
+             @label{login.register}
            </button>
          </td>
        </tr>
      </table>
      <input name=action type=hidden value=register>
            </button>
          </td>
        </tr>
      </table>
      <input name=action type=hidden value=register>
-   </form>}@
-   }{
-   @#{not the guest user, allow change of details and logout}@
+   </form>}
+   }{@# not the guest user, allow change of details and logout
 
 
-   <h2>Logged in as @user@</h2>
+   <h2>Logged in as @user</h2>
 
 
-   <form class=logout action="@url@" method=POST
+   <form class=logout action="@url" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <div class=logout>
        <button class=logout name=submit type=submit>
          enctype="multipart/form-data" accept-charset=utf-8>
      <div class=logout>
        <button class=logout name=submit type=submit>
-         @label:login.logout@
+         @label{login.logout}
        </button>
      </div>
      <input name=action type=hidden value=logout>
        </button>
      </div>
      <input name=action type=hidden value=logout>
@@ -171,37 +168,37 @@ USA
 
    <p>Use this form to change your email address and/or password.</p>
 
 
    <p>Use this form to change your email address and/or password.</p>
 
-   <form class=edituser action="@url@" method=POST
+   <form class=edituser action="@url" method=POST
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=edituser>
        <tr>
          enctype="multipart/form-data" accept-charset=utf-8>
      <table class=edituser>
        <tr>
-         <td>@label:login.email@</td>
+         <td>@label{login.email}</td>
          <td>
            <input class=email name=email type=text size=32
          <td>
            <input class=email name=email type=text size=32
-                 value="@userinfo:email@">
+                 value="@userinfo{email}">
          </td>
          </td>
-         <td class=extra>@label:login.edituseremailextra@</td>
+         <td class=extra>@label{login.edituseremailextra}</td>
        </tr>
        <tr>
        </tr>
        <tr>
-         <td>@label:login.newpassword@</td>
+         <td>@label{login.newpassword}</td>
          <td>
            <input class=password name=changepassword1 type=password size=32
                  value="">
          </td>
          <td>
            <input class=password name=changepassword1 type=password size=32
                  value="">
          </td>
-         <td class=extra>@label:login.edituserpassword1extra@</td>
+         <td class=extra>@label{login.edituserpassword1extra}</td>
        </tr>
        <tr>
        </tr>
        <tr>
-         <td>@label:login.newpassword@</td>
+         <td>@label{login.newpassword}</td>
          <td>
            <input class=password name=changepassword2 type=password size=32
                  value="">
          </td>
          <td>
            <input class=password name=changepassword2 type=password size=32
                  value="">
          </td>
-         <td class=extra>@label:login.edituserpassword2extra@</td>
+         <td class=extra>@label{login.edituserpassword2extra}</td>
        </tr>
        <tr>
          <td colspan=3>
            <button class=edituser name=submit type=submit>
        </tr>
        <tr>
          <td colspan=3>
            <button class=edituser name=submit type=submit>
-             @label:login.edituser@
+             @label{login.edituser}
            </button>
          </td>
        </tr>
            </button>
          </td>
        </tr>
@@ -209,7 +206,7 @@ USA
      <input name=action type=hidden value=edituser>
    </form>
 
      <input name=action type=hidden value=edituser>
    </form>
 
-   }@
+   }
 
 @credits
  </body>
 
 @credits
  </body>
Multi-user software jukebox -- https://www.greenend.org.uk/rjk/disorder/