Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
branch: master
Commits on Apr 27, 2015
  1. @fabpot

    minor #128 Added documentation for wordwrap and truncate filter (drit…

    fabpot authored
    …ter)
    
    This PR was squashed before being merged into the 1.2.x-dev branch (closes #128).
    
    Discussion
    ----------
    
    Added documentation for wordwrap and truncate filter
    
    As requested in #86, here is some documentation for wordwrap and truncate.
    
    Commits
    -------
    
    33eb901 Added documentation for wordwrap and truncate filter
  2. @dritter @fabpot

    Added documentation for wordwrap and truncate filter

    dritter authored fabpot committed
Commits on Apr 10, 2015
  1. @fabpot

    minor #133 Update intl.rst (pyguerder)

    fabpot authored
    This PR was merged into the 1.2.x-dev branch.
    
    Discussion
    ----------
    
    Update intl.rst
    
    Minor edit to list filters.
    
    Commits
    -------
    
    0f7fd0b Update intl.rst
  2. @pyguerder

    Update intl.rst

    pyguerder authored
    Minor edit to list filters.
Commits on Feb 16, 2015
  1. @fabpot

    remove version in docs

    fabpot authored
Commits on Oct 30, 2014
  1. @fabpot

    bumped version in composer.json

    fabpot authored
Commits on Oct 22, 2014
  1. @fabpot

    minor #123 Update links (mhor)

    fabpot authored
    This PR was merged into the 1.1.x-dev branch.
    
    Discussion
    ----------
    
    Update links
    
    Commits
    -------
    
    e7371ac update lib link
Commits on Oct 21, 2014
  1. @mhor

    update lib link

    mhor authored
Commits on Aug 8, 2014
  1. @fabpot

    minor #118 Removes nl2br from the text documentation (enkrates)

    fabpot authored
    This PR was merged into the 1.1.x-dev branch.
    
    Discussion
    ----------
    
    Removes nl2br from the text documentation
    
    The documentation for the text extensions still refers to the
    nl2br tag, which has been removed from extensions and added to
    the main Twig repo. This commit removes the mention of nl2br
    from this repo.
    
    Commits
    -------
    
    9af0ed4 Removes nl2br from the text documentation
Commits on Aug 7, 2014
  1. @enkrates

    Removes nl2br from the text documentation

    enkrates authored
    The documentation for the text extensions still refers to the
    nl2br tag, which has been removed from extensions and added to
    the main Twig repo. This commit removes the mention of nl2br
    from this repo.
Commits on Aug 5, 2014
  1. @fabpot

    feature #115 Add "localizednumber" and "localizedcurrency" filters (G…

    fabpot authored
    …arfield-fr, michaelperrin)
    
    This PR was merged into the 1.1.x-dev branch.
    
    Discussion
    ----------
    
    Add "localizednumber" and "localizedcurrency" filters
    
    Hello,
    
    This is a new version of PR #55 proposed by @Garfield-fr:
    
    * Rebased on the `master` branch
    * Made some changes according to comments made by @stof: remove unneeded arguments, checks on provided values
    * Added documentation
    
    As for the name of these filters, I would go for `localized_date`, `localized_number` and `localized_currency` but as `localizeddate` already exists, I preferred to keep the (weird) naming convention to keep backward compatibility.
    
    Naming conventions changes could be made in an other PR, for a future version of Twig.
    
    I didn't add tests as there is currently no test for any filter (apart from grammar checks).
    
    I can squash all commits into one if needed.
    
    Commits
    -------
    
    76f532d Add documentation for localizednumber and localizedcurrency filters
    f6c4130 Add checks on "localizednumber" and "localizedcurrency" filters and small tweaks
    380f7f0 Rename getNumberFormatter to twig_get_number_formatter
    448a309 Added new filters localizednumber and localizedcurrency on Intl extension
Commits on Jul 30, 2014
  1. @michaelperrin
  2. @michaelperrin
Commits on Jul 25, 2014
  1. @fabpot

    fixed typo

    fabpot authored
  2. @fabpot

    feature #109 Extension for displaying dates in a time ago format #par…

    fabpot authored
    …tdeux (RobinvdVleuten)
    
    This PR was merged into the 1.1.x-dev branch.
    
    Discussion
    ----------
    
    Extension for displaying dates in a time ago format #partdeux
    
    Hi,
    
    My PR for added a time_diff extension (#83) was way to messy with commits. I've recreated it in a single rebased commit.
    
    Commits
    -------
    
    665bbe0 Extension for displaying dates in a time ago format
  3. @RobinvdVleuten
Commits on Jul 24, 2014
  1. @Garfield-fr @michaelperrin
  2. @Garfield-fr @michaelperrin
Commits on Jul 14, 2014
  1. @fabpot

    minor #114 Adding some additional installation details (weaverryan)

    fabpot authored
    This PR was merged into the 1.1.x-dev branch.
    
    Discussion
    ----------
    
    Adding some additional installation details
    
    Hi guys!
    
    This follows this conversation: https://groups.google.com/forum/#!topic/twig-users/B3NB8zU0Mg8
    
    It doesn't actually say in the docs how to install the extension or that you need to add the extensions into Twig. That's especially confusing if you just somehow end up on this page: http://twig.sensiolabs.org/doc/extensions/index.html, which somewhat looks like core Twig functionality.
    
    This compiled locally without any warnings and looked fine to me.
    
    Thanks!
    
    Commits
    -------
    
    2a97452 Adding some additional installation details
Commits on Jul 13, 2014
  1. @weaverryan
Commits on Jul 9, 2014
  1. @fabpot

    minor #113 docs, tests and bug fix for pull 122 (joserobleda)

    fabpot authored
    This PR was squashed before being merged into the 1.1.x-dev branch (closes #113).
    
    Discussion
    ----------
    
    docs, tests and bug fix for pull 122
    
    This is a continuation of the pull #112
    
    - [ ] `doc/i18n.rst` now includes the `notes` usage and example
    - [ ] Added 3 test cases for different `notes` combinations
    - [ ] As `notes` adds an inline php comment to the compiled template line breaks should be removed
    
    Commits
    -------
    
    5965f45 docs, tests and bug fix for pull 122
  2. @joserobleda @fabpot

    docs, tests and bug fix for pull 122

    joserobleda authored fabpot committed
Commits on Jul 8, 2014
  1. @fabpot

    feature #112 Add support for the --add-comments xgettext parameter (j…

    fabpot authored
    …oserobleda)
    
    This PR was squashed before being merged into the 1.1.x-dev branch (closes #112).
    
    Discussion
    ----------
    
    Add support for the --add-comments xgettext parameter
    
    When using the I18n extension in Twig I miss the ability to write comments in the line before the `gettext` call in order to fill the "notes for translator" in the `.po` files. I think this is very useful to put the translator in the right context to make a better translation
    
    I create a new reserved word `notes` so a trans expression will look like this:
    
    ````
    {% trans %}
        There is one thing you have to check!
    {% plural alerts %}
        There are {{ alerts }} things you have to check!
    {% notes %}
        This refers to a pending actions that the user have to do and will be shown in the home page
    {% endtrans %}
    ````
    
    In poedit you have to add to the parser the parameter like this if you want to read those notes
    
    `xgettext --add-comments=notes`
    
    @fabpot this is the very first time I look into the Twig internals and I don't know if I made a good code, but there are just a few lines to review
    
    Commits
    -------
    
    8201729 Add support for the --add-comments xgettext parameter
  2. @joserobleda @fabpot

    Add support for the --add-comments xgettext parameter

    joserobleda authored fabpot committed
  3. @fabpot

    minor #103 Some minor changes (Szymciosek)

    fabpot authored
    This PR was squashed before being merged into the 1.1.x-dev branch (closes #103).
    
    Discussion
    ----------
    
    Some minor changes
    
    Commits
    -------
    
    d6f2436 Some minor changes
  4. @Szymciosek @fabpot

    Some minor changes

    Szymciosek authored fabpot committed
Commits on Jul 5, 2014
  1. @fabpot
  2. @fabpot

    bumped version

    fabpot authored
Commits on Mar 1, 2014
  1. @fabpot

    minor #95 updated filters registration (Trainmaster)

    fabpot authored
    This PR was squashed before being merged into the 1.0.x-dev branch (closes #95).
    
    Discussion
    ----------
    
    updated filters registration
    
    Use Twig_SimpleFilter instead of Twig_Filter_Function (deprecated as of
    Twig 1.12).
    
    Commits
    -------
    
    9149c07 updated filters registration
  2. @Trainmaster @fabpot

    updated filters registration

    Trainmaster authored fabpot committed
  3. @fabpot

    added travis configuration

    fabpot authored
  4. @fabpot

    bug #104 Fix truncate issue with preserve at true on last word (jpeti…

    fabpot authored
    …tcolas)
    
    This PR was squashed before being merged into the 1.0.x-dev branch (closes #104).
    
    Discussion
    ----------
    
    Fix truncate issue with preserve at true on last word
    
    Currently, using `truncate` filter allows to not cut a word in the middle, thanks to the `preserve` argument. However, the word is cut if it is the last word of the text. For instance, `My long sentence"|truncate(10, true)` would return `My long se...`.
    
    This PR aims to fix this behavior, adding some unit tests to prove the bug resolution.
    
    Commits
    -------
    
    1ec30de Fix truncate issue with preserve at true on last word
  5. @jpetitcolas @fabpot

    Fix truncate issue with preserve at true on last word

    jpetitcolas authored fabpot committed
Commits on Nov 27, 2013
  1. @fabpot

    minor #96 Adjust the deprecated caution wording for clarity (chadburrus)

    fabpot authored
    This PR was merged into the master branch.
    
    Discussion
    ----------
    
    Adjust the deprecated caution wording for clarity
    
    The prior wording seemed awkward to me, so I tweaked it to flow a little better.
    
    Commits
    -------
    
    70693a7 Adjust the deprecated caution wording for clarity
  2. @chadburrus

    Adjust the deprecated caution wording for clarity

    chadburrus authored chadburrus committed
    The prior wording seemed awkward to me, so I tweaked it to flow a little
    better.
Something went wrong with that request. Please try again.