Hi Danilo,

Just a couple of minor comments.

Gavin.


> === modified file 'lib/lp/translations/browser/language.py'
> --- lib/lp/translations/browser/language.py	2009-09-10 13:31:25 +0000
> +++ lib/lp/translations/browser/language.py	2009-09-16 13:02:09 +0000
> @@ -170,7 +170,7 @@
>          for item in pluralforms_list:
>              examples = ", ".join(map(str, item['examples']))
>              if len(item['examples']) != 1:
> -                examples += ", ..."
> +                examples += "..."
>              else:
>                  examples += "."
>              item['examples'] = examples
>
> === modified file 'lib/lp/translations/browser/tests/language-views.txt'
> --- lib/lp/translations/browser/tests/language-views.txt	2009-09-14 14:55:01 +0000
> +++ lib/lp/translations/browser/tests/language-views.txt	2009-09-16 13:02:09 +0000
> @@ -22,8 +22,9 @@
>      >>> print language_admin_view.page_title
>      Edit Portuguese (Brazil) (pt_BR)
>
> -The view provides also a cancel_url and a next_url, but they're the same because
> -the previous and next steps of editing a language are returning to its index.
> +The view provides also a cancel_url and a next_url, but they're the same
> +because the previous and next steps of editing a language are returning
> +to its index.
>
>      >>> print language_admin_view.cancel_url
>      http://translations.launchpad.dev/+languages/pt_BR
> @@ -35,7 +36,7 @@
>  Add Language
>  ------------------
>
> -    >>> language_add_view = create_view(language_set, '+add',
> +    >>> language_add_view = create_view(language_set, '+add',
>      ...     layer=TranslationsLayer)
>
>      >>> print language_add_view.label
> @@ -50,7 +51,8 @@
>      http://translations.launchpad.dev/+languages
>
>      >>> print language_add_view.field_names
> -    ['code', 'englishname', 'nativename', 'pluralforms', 'pluralexpression', 'visible', 'direction']
> +    ['code', 'englishname', 'nativename', 'pluralforms',
> +    'pluralexpression', 'visible', 'direction']
>
>      >>> login("<email address hidden>")
>      >>> form = {
> @@ -81,15 +83,16 @@
>      >>> language_view = create_initialized_view(serbian, '+index',
>      ...     layer=TranslationsLayer)
>
> -The friendlypluralforms function shows us a list of plural forms and a set of examples
> -for each one, so one won't need to understand the plural formula expression to see how it works.
> +The friendlypluralforms function shows us a list of plural forms and
> +a set of examples for each one, so one won't need to understand the plural
> +formula expression to see how it works.
>
>      >>> friendly_plural_forms = language_view.friendly_plural_forms
>
>      >>> for form_dict in friendly_plural_forms:
>      ...     print form_dict['form'], ':', form_dict['examples']
> -    0 : 1.
> -    1 : 2, 3, 4, ...
> -    2 : 5, 6, 7, 8, 9, 10, ...
> +    0 : 1, 21, 31, 41, 51, 61...
> +    1 : 2, 3, 4, 22, 23, 24...
> +    2 : 5, 6, 7, 8, 9, 10...
>
>
>
> === modified file 'lib/lp/translations/stories/standalone/xx-language.txt'
> --- lib/lp/translations/stories/standalone/xx-language.txt	2009-09-14 15:18:41 +0000
> +++ lib/lp/translations/stories/standalone/xx-language.txt	2009-09-16 13:02:09 +0000
> @@ -13,7 +13,7 @@
>
>  Following the link, there is a form to add new languages.
>
> -    >>> admin_browser.getLink('Add Language').click()
> +    >>> admin_browser.getLink('Add new language').click()
>      >>> print admin_browser.url
>      http://translations.launchpad.dev/+languages/+add
>
> @@ -60,7 +60,7 @@
>      >>> print user_browser.url
>      http://translations.launchpad.dev/+languages
>
> -    >>> user_browser.getLink('Add Language')
> +    >>> user_browser.getLink('Add new language')
>      Traceback (most recent call last):
>      ...
>      LinkNotFoundError
> @@ -78,14 +78,14 @@
>
>      >>> text_search = browser.getControl(name='language_search')
>      >>> text_search.value = 'Spanish'
> -    >>> browser.getControl('Search', index=0).click()
> +    >>> browser.getControl('Find language', index=0).click()
>      >>> print browser.url
>      http://translations.launchpad.dev/+languages/+index
>
>  And following one of the found languages, we can see a brief information
>  about the selected language.
>
> -    >>> browser.getLink('Spanish (es)').click()
> +    >>> browser.getLink('Spanish').click()
>      >>> print browser.url
>      http://translations.launchpad.dev/+languages/es
>
> @@ -94,10 +94,9 @@
>      Plural forms
>      Spanish has 2 plural forms:
>      Form 0 for 1.
> -    Form 1 for 2, 3, 4, 5, 6, 7, ...
> +    Form 1 for 2, 3, 4, 5, 6, 7...
>      When ...
>
> -
>      >>> translationteams_portlet = find_portlet(
>      ...     browser.contents, 'Translation teams')
>      >>> print translationteams_portlet
>
> === modified file 'lib/lp/translations/templates/languageset-index.pt'
> --- lib/lp/translations/templates/languageset-index.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/translations/templates/languageset-index.pt	2009-09-16 13:02:09 +0000
> @@ -3,97 +3,79 @@
>    xmlns:tal="http://xml.zope.org/namespaces/tal"
>    xmlns:metal="http://xml.zope.org/namespaces/metal"
>    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
> -  xml:lang="en"
> -  lang="en"
> -  dir="ltr"
> -  metal:use-macro="context/@@main_template/master"
> -  i18n:domain="launchpad"
> +  metal:use-macro="view/macro:page/main_only"
>  >
>
>    <body>
> -    <metal:portlets fill-slot="portlets">
> -    </metal:portlets>
> -
>      <div metal:fill-slot="main">
>        <h1>Languages in Launchpad</h1>
> -      <form method="post">
> -        <table>
> -          <tr>
> -            <th>
> +      <div class="yui-b top-portlet">
> +        <p>
> +          Languages registered in Launchpad can be used for per-language
> +          support with <a href="https://answers.launchpad.net">Answers</a>,

Argh, there has to be a better way to do this than hard-coding the
link. Maybe not now, but we should have something like this.

Off the top of my head, I imagine a global for doing traversals. Then
we could do things like:

  find/answers/fmt:link

  find/translations/fmt:link

  find/answers/rosetta/+faq/23/fmt:link

And so on.

Maybe this is already possible in a different way.

Also, this is totally out of scope for this branch. Still, I'm
interested if you know a way to avoid hard-coding those URLs.

> +          or for
> +          <a href="https://translations.launchpad.net">Translations</a>.
> +        </p>
> +        <p>
> +          If you can't find a language you are interested in, and you want
> +          to add it to Launchpad for either Answers or Translations, please
> +          follow
> +          <a href="https://answers.launchpad.net/rosetta/+faq/23">
> +            How to create a new language
> +          </a>
> +          FAQ entry.
> +        </p>
> +
> +        <div class="portlet">
> +          <h2>Find a language in Launchpad</h2>
> +          <form method="post">
> +            <p>
>                <label for="language_search">
> -                Search Languages in Launchpad:
> +                Language name/code contains:
>                </label>
> -            </th>
> -            <td>
> -              <input
> -                name="language_search" size="30"
> -                tal:attributes="value view/language_search" />
> -            </td>
> -          </tr>
> -          <tr>
> -            <td></td>
> -            <td>
> -              <div class="actions">
> -                <input
> -                  tal:condition="view/search_requested"
> -                  type="submit"
> -                  value="Search Again"
> -                  />
> -                <input
> -                  tal:condition="not: view/search_requested"
> -                  type="submit"
> -                  value="Search Languages"
> -                  />
> -              </div>
> -            </td>
> -          </tr>
> -        </table>
> -      </form>
> -      <div tal:condition="view/search_requested">
> +              <input
> +                 name="language_search" size="30"
> +                 tal:attributes="value view/language_search" />
> +              <input
> +                 type="submit"
> +                 value="Find language"
> +                 />
> +            </p>
> +          </form>
> +          <div tal:condition="context/required:launchpad.Admin">
> +            <a href="+add" class="add sprite">Add new language</a>

Could you use tal:attributes="href context/fmt:url/+add" here instead?

> +          </div>
> +        </div>
> +      </div>
> +      <div tal:condition="view/search_requested" class="yui-b portlet">
>          <tal:block tal:define="results view/search_results">
> -          <table class="listing">
> -            <thead>
> -              <tr class="results">
> -                <td colspan="0">
> -                  <span tal:replace="view/search_matches">3</span>
> -                  <span tal:condition="python: view.search_matches == 1">
> -                    result
> -                  </span>
> -                  <span tal:condition="python: view.search_matches != 1">
> -                    results
> -                  </span>
> -                </td>
> -              </tr>
> -            </thead>
> -            <tbody>
> -              <tr>
> -                <td>
> -                  <dl condition="view/search_matches" class="languages">
> -                    <tal:block repeat="language results">
> -                      <dt>
> -                        <a tal:attributes="href language/code">
> -                          <dfn tal:content="language/englishname">
> -                            $Language.englishname
> -                          </dfn>
> -                          (<span tal:replace="language/code">
> -                             $Language.code
> -                           </span>)
> -                        </a>
> -                      </dt>
> -                      <dd>
> -                      </dd>
> -                    </tal:block>
> -                  </dl>
> -                  <p tal:condition="not: view/search_matches">
> -                    <strong>No Languages matching &#8220;
> -                      <span tal:replace="view/language_search">Foo</span>&#8221;
> -                      were found.
> -                    </strong>
> -                  </p>
> -                </td>
> -              </tr>
> -            </tbody>
> -          </table>
> +          <tal:none condition="not: view/search_matches">
> +            <h2>No matching languages</h2>
> +            <p>No languages matching
> +              &#8220;<span tal:replace="view/language_search">
> +                Foo
> +              </span>&#8221; were found.
> +            </p>
> +          </tal:none>
> +          <tal:one condition="python: view.search_matches == 1">
> +            <h2>One matching language</h2>
> +          </tal:one>
> +          <tal:more condition="python: view.search_matches > 1">
> +            <h2>
> +              <tal:count replace="view/search_matches">3</tal:count>
> +              matching languages
> +            </h2>
> +          </tal:more>
> +          <dl condition="view/search_matches" class="languages">
> +            <tal:language repeat="language results">
> +              <dt>
> +                <a tal:replace="structure language/fmt:link">
> +                  Serbian (sr)
> +                </a>
> +              </dt>
> +              <dd></dd>

Any reason to not use a <ul> here, as there is nothing in the <dd>?

> +            </tal:language>
> +          </dl>
>          </tal:block>
>        </div>
>      </div>
>
> === modified file 'lib/lp/translations/templates/object-templates.pt'
> --- lib/lp/translations/templates/object-templates.pt	2009-07-17 17:59:07 +0000
> +++ lib/lp/translations/templates/object-templates.pt	2009-09-16 13:02:09 +0000
> @@ -2,16 +2,8 @@
>    xmlns="http://www.w3.org/1999/xhtml"
>    xmlns:tal="http://xml.zope.org/namespaces/tal"
>    xmlns:metal="http://xml.zope.org/namespaces/metal"
> -  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
> -  xml:lang="en"
> -  lang="en"
> -  dir="ltr"
> -  metal:use-macro="view/macro:page/onecolumn"
> -  i18n:domain="launchpad"
> -><!-- context/@@main_template/master
> -      view/macro:page/onecolumn
> - -->
> -
> +  metal:use-macro="view/macro:page/main_only"
> +>
>    <body>
>      <div metal:fill-slot="head_epilogue">
>        <style type="text/css">
> @@ -61,13 +53,6 @@
>        </script>
>      </div>
>      <div metal:fill-slot="main">
> -      <h1>
> -        Translation templates for
> -        <tal:title replace="context/title">
> -          evolution in Ubuntu Feisty
> -        </tal:title>
> -      </h1>
> -
>        <ul class="helplinks">
>          <li>
>            <a href="https://help.launchpad.net/Translations"
> @@ -77,6 +62,21 @@
>          </li>
>        </ul>
>
> +      <h1>
> +        Translation templates for
> +        <tal:title replace="context/title">
> +          evolution in Ubuntu Feisty
> +        </tal:title>
> +      </h1>
> +
> +      <div class="yui-b top-portlet">
> +        <p>
> +          This is a listing of all the translatable templates
> +          in <a tal:replace="structure context/fmt:link">here</a>.
> +        </p>
> +      </div>
> +
> +      <div class="yui-b">
>        <table class="sortable listing" id="templates_table">
>          <thead>
>            <tr>
> @@ -114,6 +114,7 @@
>            </tr>
>          </tbody>
>        </table>
> +      </div>
>      </div>
>    </body>
>  </html>
>
> === modified file 'lib/lp/translations/utilities/doc/pluralforms.txt'
> --- lib/lp/translations/utilities/doc/pluralforms.txt	2009-09-14 14:55:01 +0000
> +++ lib/lp/translations/utilities/doc/pluralforms.txt	2009-09-16 13:02:09 +0000
> @@ -7,20 +7,20 @@
>  make_friendly_plural_forms
>  --------------------------
>
> -The make_friendly_plural_forms method creates a list of dicts, each one containing a
> -plural form number and a list of examples for this plural form.
> -It uses as input the plural forms expression for the language, C-like, and the number
> -of plural forms for the considered language.
> +The make_friendly_plural_forms method creates a list of dicts, each one
> +containing a plural form number and a list of examples for this plural form.
> +It uses as input the plural forms expression for the language, C-like, and
> +the number of plural forms for the considered language.
>
>      >>> from lp.translations.utilities.pluralforms import (
>      ...     make_friendly_plural_forms)
>
> -
> -Let's use the serbian language as example. Here's the plural forms expression for serbian:
> +Let's use a Serbian language as example. Here's the plural forms
> +expression for Serbian:
>
>      >>> expression = 'n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2'
>
> -It's also known that serbian has 3 plural forms.
> +It's also known that Serbian has 3 plural forms.
>
>      >>> pluralforms_count = 3
>
> @@ -29,6 +29,6 @@
>
>      >>> for form_dict in friendly_plural_forms:
>      ...     print form_dict['form'], ":", form_dict['examples']
> -    0 : [1]
> -    1 : [2, 3, 4]
> +    0 : [1, 21, 31, 41, 51, 61]
> +    1 : [2, 3, 4, 22, 23, 24]
>      2 : [5, 6, 7, 8, 9, 10]
>
> === modified file 'lib/lp/translations/utilities/pluralforms.py'
> --- lib/lp/translations/utilities/pluralforms.py	2009-09-11 03:06:13 +0000
> +++ lib/lp/translations/utilities/pluralforms.py	2009-09-16 13:02:09 +0000
> @@ -25,9 +25,6 @@
>          forms.setdefault(form, [])
>          # If all the plural forms for this language have examples (max. of 6
>          # numbers per plural form), it stops.
> -        if (len(forms[form]) == MAX_EXAMPLES and
> -                len(forms) == pluralforms_count):
> -            break
>          if len(forms[form]) == MAX_EXAMPLES:
>              continue
>          forms[form].append(number)
>