From 6ab1f4a4f0958fbbb13fd5f7e5903ae57657e3b2 Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Tue, 8 Mar 2011 14:42:24 +0100 Subject: [PATCH 01/51] Fix some spelling mistakes (closes issue 441) --- src/IDF/templates/idf/faq.html | 4 ++-- src/IDF/templates/idf/register/confirmation.html | 2 +- src/IDF/templates/idf/register/index.html | 2 +- src/IDF/templates/idf/register/inputkey.html | 2 +- src/IDF/templates/idf/review/create.html | 2 +- src/IDF/templates/idf/source/git/help.html | 2 +- src/IDF/templates/idf/user/changeemail.html | 2 +- src/IDF/templates/idf/user/myaccount.html | 2 +- src/IDF/templates/idf/user/passrecovery-ask.html | 2 +- src/IDF/templates/idf/user/passrecovery-inputkey.html | 4 ++-- src/IDF/templates/idf/user/passrecovery.html | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/IDF/templates/idf/faq.html b/src/IDF/templates/idf/faq.html index bcf6f93..db821da 100644 --- a/src/IDF/templates/idf/faq.html +++ b/src/IDF/templates/idf/faq.html @@ -5,7 +5,7 @@
  • {trans 'What are the keyboard shortcuts?'}
  • {trans 'How to mark an issue as duplicate?'}
  • {trans 'How can I display my head next to my comments?'}
    • -
  • {trans 'What is the API and how to use it?'}
    • +
  • {trans 'What is the API and how is it used?'}

    • {trans 'What are the keyboard shortcuts?'}

    @@ -48,7 +48,7 @@

    {blocktrans}You need to create an account on Gravatar, this takes about 5 minutes and is free.{/blocktrans}

    -

    {trans 'What is the API and how to use it?'}

    +

    {trans 'What is the API and how is it used?'}

    {blocktrans}The API (Application Programming Interface) is used to interact with InDefero with another program. For example, this can be used to create a desktop program to submit new tickets easily.{/blocktrans}

    {aurl 'url', 'IDF_Views::faqApi'}

    {blocktrans}Learn more about the API.{/blocktrans}

    diff --git a/src/IDF/templates/idf/register/confirmation.html b/src/IDF/templates/idf/register/confirmation.html index fa2cc36..cb4bf95 100644 --- a/src/IDF/templates/idf/register/confirmation.html +++ b/src/IDF/templates/idf/register/confirmation.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the form for errors.'}

    +

    {trans 'Oops, please check the form for errors.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/register/index.html b/src/IDF/templates/idf/register/index.html index 17bfb3b..4b862aa 100644 --- a/src/IDF/templates/idf/register/index.html +++ b/src/IDF/templates/idf/register/index.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the provided login and email address to register.'}

    +

    {trans 'Oops, please check the provided login and email address to register.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/register/inputkey.html b/src/IDF/templates/idf/register/inputkey.html index ed65976..e79e2c0 100644 --- a/src/IDF/templates/idf/register/inputkey.html +++ b/src/IDF/templates/idf/register/inputkey.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, we found an error in the form.'}

    +

    {trans 'Oops, we found an error in the form.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/review/create.html b/src/IDF/templates/idf/review/create.html index 1a5a74e..d96caa5 100644 --- a/src/IDF/templates/idf/review/create.html +++ b/src/IDF/templates/idf/review/create.html @@ -57,7 +57,7 @@
    • A commit or revision of the current code in the repository from which you started your work.
    • A patch describing your changes with respect to the reference commit.
      • -
    • Ensure your patch does not contain any passwords or confidential information!
      • +
    • Check your patch does not provide any password or confidential information!
    {/blocktrans}
    {/block} diff --git a/src/IDF/templates/idf/source/git/help.html b/src/IDF/templates/idf/source/git/help.html index 72c3a55..e270111 100644 --- a/src/IDF/templates/idf/source/git/help.html +++ b/src/IDF/templates/idf/source/git/help.html @@ -11,7 +11,7 @@ code.{/blocktrans}

    git clone {$project.getSourceAccessUrl($user)}

    {aurl 'url', 'IDF_Views_User::myAccount'} -

    {blocktrans}You may need to provide your SSH key. The synchronization of your SSH key can take a couple of minutes. You can learn more about SSH key authentification.{/blocktrans}

    +

    {blocktrans}You may need to provide your SSH key. The synchronization of your SSH key can take a couple of minutes. You can learn more about SSH key authentication.{/blocktrans}

    {if $isOwner or $isMember}

    {trans 'First Commit'}

    diff --git a/src/IDF/templates/idf/user/changeemail.html b/src/IDF/templates/idf/user/changeemail.html index 6a29b3d..3ddb4c7 100644 --- a/src/IDF/templates/idf/user/changeemail.html +++ b/src/IDF/templates/idf/user/changeemail.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, we found an error in the form.'}

    +

    {trans 'Oops, we found an error in the form.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/user/myaccount.html b/src/IDF/templates/idf/user/myaccount.html index f84dbec..4fceeae 100644 --- a/src/IDF/templates/idf/user/myaccount.html +++ b/src/IDF/templates/idf/user/myaccount.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the form for errors.'}

    +

    {trans 'Oops, please check the form for errors.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/user/passrecovery-ask.html b/src/IDF/templates/idf/user/passrecovery-ask.html index 5cd48eb..dfc3e58 100644 --- a/src/IDF/templates/idf/user/passrecovery-ask.html +++ b/src/IDF/templates/idf/user/passrecovery-ask.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, please check the provided login or email address to recover your password.'}

    +

    {trans 'Oops, please check the provided login or email address to recover your password.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} diff --git a/src/IDF/templates/idf/user/passrecovery-inputkey.html b/src/IDF/templates/idf/user/passrecovery-inputkey.html index ef58d88..a55c6a5 100644 --- a/src/IDF/templates/idf/user/passrecovery-inputkey.html +++ b/src/IDF/templates/idf/user/passrecovery-inputkey.html @@ -2,7 +2,7 @@ {block body} {if $form.errors}
    -

    {trans 'Oups, we found an error in the form.'}

    +

    {trans 'Oops, we found an error in the form.'}

    {if $form.get_top_errors} {$form.render_top_errors|unsafe} {/if} @@ -30,7 +30,7 @@

    {trans 'Instructions'}

    {trans 'Use your email software to read your emails and open your verification email. Either click directly on the verification link or copy/paste the verification key in the box and submit the form.'}

    -

    {trans 'Just after providing the confirmation key, you will be able to reset your password and use again this website fully.'}

    +

    {trans 'Just after providing the confirmation key, you will be able to reset your password and use this website fully.'}

    {/block} {block javascript} + {appversion}
    diff --git a/src/IDF/templates/idf/base-simple.html b/src/IDF/templates/idf/base-simple.html index 39c1a9b..8a0a3d5 100644 --- a/src/IDF/templates/idf/base-simple.html +++ b/src/IDF/templates/idf/base-simple.html @@ -32,6 +32,7 @@ {block extraheader}{/block} {block pagetitle}{$page_title|strip_tags}{/block} + {appversion}
    diff --git a/src/IDF/templates/idf/base.html b/src/IDF/templates/idf/base.html index 0d3cfb1..cfddd85 100644 --- a/src/IDF/templates/idf/base.html +++ b/src/IDF/templates/idf/base.html @@ -32,6 +32,7 @@ {block extraheader}{/block} {block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if} + {appversion}
    diff --git a/src/IDF/templates/idf/gadmin/base.html b/src/IDF/templates/idf/gadmin/base.html index 15e830d..4f8a745 100644 --- a/src/IDF/templates/idf/gadmin/base.html +++ b/src/IDF/templates/idf/gadmin/base.html @@ -31,6 +31,7 @@ {block extraheader}{/block} {block pagetitle}{$page_title|strip_tags}{/block} + {appversion}
    diff --git a/src/IDF/version.php b/src/IDF/version.php new file mode 100644 index 0000000..cd5ca11 --- /dev/null +++ b/src/IDF/version.php @@ -0,0 +1,5 @@ + '1.1-dev', + 'revision' => '$Format:%H$', +); From 0899ba8515842844deb228d62096249aa1577591 Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Sun, 20 Mar 2011 01:07:34 +0100 Subject: [PATCH 49/51] Various smaller fixes to the Makefile. - Rename the %_tarball targets to %-zipfile (which they actually are) and use a dash instead of an underscore for easier typing - Use the short revision id in the file name (the file src/IDF/version.php contains the full ID) - Improve the English for some descriptions and break long lines into the next line --- Makefile | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 762327f..942b144 100644 --- a/Makefile +++ b/Makefile @@ -26,20 +26,20 @@ .PHONY: help help: - @printf "Rules for generate tarball :\n" + @printf "Rules for generating distributable files :\n" @for b in `git branch | sed "s/^. //g"`; do \ - printf "\t"$$b"_tarball - Generate a zip archive of the "$$b" branch.\n"; \ + printf "\t"$$b"-zipfile - Generate a zip archive of the "$$b" branch.\n"; \ done - @printf "\nRules for internationnalization :\n"; - @printf "\tpot-update - Update the POT file from HTML template and PHP source, then merge it with PO file.\n" - @printf "\tpot-push - Send the POT file on transifex server.\n" - @printf "\tpo-update - Merge POT file into PO file. POT is not regenerated.\n" - @printf "\tpo-push - Send the all PO file on transifex server.\n" - @printf "\tpo-pull - Get all PO file from transifex server.\n" - @printf "\tpo-stats - Show statistics about translation on each PO file .\n" + @printf "\nRules for internationalization :\n"; + @printf "\tpot-update - Update the POT file from HTML templates and PHP sources, then merge it with PO file.\n" + @printf "\tpot-push - Send the POT file to the transifex server.\n" + @printf "\tpo-update - Merge the POT file into the PO file. The POT is not regenerated.\n" + @printf "\tpo-push - Send the all PO files to the transifex server.\n" + @printf "\tpo-pull - Get all PO files from the transifex server.\n" + @printf "\tpo-stats - Show translation statistics of all PO files.\n" # -# Internationnalization rule, POT & PO file manipulation +# Internationalization rule, POT & PO file manipulation # .PHONY: pluf_path pluf_path: @@ -61,7 +61,8 @@ pot-update: pluf_path @cd src; php $(PLUF_PATH)/extracttemplates.php IDF/conf/idf.php IDF/gettexttemplates @cd src; for phpfile in `find . -iname "*.php"`; do \ printf "Parsing file : "$$phpfile"\n"; \ - xgettext -o idf.pot -p ./IDF/locale/ --from-code=UTF-8 -j --keyword --keyword=__ --keyword=_n:1,2 -L PHP $$phpfile ; \ + xgettext -o idf.pot -p ./IDF/locale/ --from-code=UTF-8 -j \ + --keyword --keyword=__ --keyword=_n:1,2 -L PHP $$phpfile ; \ done # Remove tmp folder rm -Rf src/IDF/gettexttemplates @@ -91,14 +92,14 @@ check-tx-config: printf "source_file = src/IDF/locale/idf.pot\n" >> .tx/config; \ printf "source_lang = en\n" >> .tx/config; \ fi - @if [ ! -e $(HOME)/.transifexrc ]; then \ + @if [ ! -e $(HOME)/.transifexrc ]; then \ touch $(HOME)/.transifexrc; \ - printf "[http://www.transifex.net]\n" >> $(HOME)/.transifexrc; \ + printf "[http://www.transifex.net]\n" >> $(HOME)/.transifexrc; \ printf "username = \n" >> $(HOME)/.transifexrc; \ - printf "token = \n" >> $(HOME)/.transifexrc; \ + printf "token = \n" >> $(HOME)/.transifexrc; \ printf "password = \n" >> $(HOME)/.transifexrc; \ - printf "hostname = http://www.transifex.net\n" >> $(HOME)/.transifexrc; \ - printf "You must edit the file ~/.transifexrc to setup your transifex account (login & password) !\n"; \ + printf "hostname = http://www.transifex.net\n" >> $(HOME)/.transifexrc; \ + printf "You must edit the file ~/.transifexrc to setup your transifex account (login & password) !\n"; \ exit 1; \ fi @@ -129,10 +130,12 @@ po-stats: done # -# Generic rule to build a tarball of indefero for a specified branch -# ex: make master_tarball -# make dev_tarball +# Generic rule to build a zipfile of indefero for a specified branch +# ex: make master_zipfile +# make develop_zipfile # -%_tarball: - @git archive --format=zip --prefix="indefero/" $(@:_tarball=) > indefero-$(@:_tarball=)-`git log $(@:_tarball=) -n 1 --pretty=format:%H`.zip +%-zipfile: + @git archive --format=zip --prefix="indefero/" $(@:-zipfile=) \ + > indefero-$(@:-zipfile=)-`git log $(@:-zipfile=) -n 1 \ + --pretty=format:%h`.zip From 909c76ebfb84754d4f9f489a23eccf1bdf4e53be Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Sun, 20 Mar 2011 01:10:48 +0100 Subject: [PATCH 50/51] Note that together with issue 136 also issue 500 was fixed. --- NEWS.mdtext | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.mdtext b/NEWS.mdtext index 58e5617..3566f97 100644 --- a/NEWS.mdtext +++ b/NEWS.mdtext @@ -21,7 +21,7 @@ * _Other_: - Enhanced user profile page (issue 510) - - Manage multiple (commit) emails in the account settings (issue 136) + - Manage multiple (commit) emails in the account settings (issues 136 and 500) - Filter the timeline and its feed by item type (issue 543) - Add multiple email addresses for project notifications (issue 372) - Direct links to other projects via the new `Project List` dropdown From 627bc4e45fbe29915d5bf3bb2721a2c35ea6a3b2 Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Sun, 20 Mar 2011 12:44:21 +0100 Subject: [PATCH 51/51] Enter a release date and the proper version --- NEWS.mdtext | 2 +- src/IDF/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.mdtext b/NEWS.mdtext index 3566f97..f04f274 100644 --- a/NEWS.mdtext +++ b/NEWS.mdtext @@ -1,4 +1,4 @@ -# InDefero 1.1 - xxx xxx xx xx:xx 2011 UTC +# InDefero 1.1 - Sun Mar 20 11:44 2011 UTC ## New Features diff --git a/src/IDF/version.php b/src/IDF/version.php index cd5ca11..c6605dc 100644 --- a/src/IDF/version.php +++ b/src/IDF/version.php @@ -1,5 +1,5 @@ '1.1-dev', + 'version' => '1.1', 'revision' => '$Format:%H$', );