[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2ed014: Avoid using concatenation in |trans filter

Michal Čihař michal at cihar.com
Thu Nov 2 14:02:44 CET 2017


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2ed01429503e2019870044d9fcb646c15af37740
      https://github.com/phpmyadmin/phpmyadmin/commit/2ed01429503e2019870044d9fcb646c15af37740
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    M templates/columns_definitions/table_fields_definitions.twig
    M templates/table/relation/common_form.twig

  Log Message:
  -----------
  Avoid using concatenation in |trans filter

The generated PHP code can not be extracted using xgettext.

This is workaround for #13794, should be reverted after proper fix.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: f7d2997d797b035a9c0cec23660fceba62b6114f
      https://github.com/phpmyadmin/phpmyadmin/commit/f7d2997d797b035a9c0cec23660fceba62b6114f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    A scripts/fix-po-twig
    M scripts/generate-twig-cache
    M scripts/update-po

  Log Message:
  -----------
  Use php for fixing line information in the Gettext files

The debug information actually maps ranges, not individual lines, so it
needs more logic.

Also the sed was really slow (as it had to replace all lines).

Issue #13344

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: ab86c9d84cf5c250c563e5c864b0021595e1339b
      https://github.com/phpmyadmin/phpmyadmin/commit/ab86c9d84cf5c250c563e5c864b0021595e1339b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/brx.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/eo.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fil.po
    M po/fr.po
    M po/fy.po
    M po/gl.po
    M po/gu.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/ig.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kab.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ku.po
    M po/ky.po
    M po/li.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Update po files

[CI skip]

Signed-off-by: Michal Čihař <michal at cihar.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5a2a115e886f...ab86c9d84cf5


More information about the Git mailing list