Review main Merged

33949[CLEANUP] Remove old .xml and .php locallang references

Benni Mack CR +2 V +2 Normal +71 −69 updated 12/12/14, 21:07

Commit message

There are still places in the CMS Core that reference locallang.php
and locallang.xml although the default is the XLIFF file format.

The old data from CSS Styled Content 6.1 and below are not respected
as they will be removed in a later patch anyway.

Review

  • Code review CR +2
    • Benni Mack +2
    • Wouter Wolters +1
    • Christian Kuhn +1
  • Verified V +2
    • Benni Mack +2
    • Wouter Wolters +1
    • Christian Kuhn +1

Issues 1

Files 17

Review log 19

  1. Benni Mack uploaded patch set 1 11/10/14, 14:22

  2. Xavier Perseguers commented on patch set 1 CR -1 11/10/14, 15:23

    AbstractPlugin.php:971

    xml (L missing)

    LanguageService.php:441

    This method should actually NOT be changed but simply deprecated, it searches for locallang_<whatever>.<locale>.php and replacing with .xlf is wrong since for XLIFF we *prefix* with the locale.
  3. Xavier Perseguers uploaded patch set 2 11/10/14, 15:29

  4. Xavier Perseguers voted on patch set 2 CR +1 11/10/14, 15:37

  5. Xavier Perseguers voted on patch set 2 V +1 11/10/14, 15:43

  6. Stefan Froemken commented on patch set 2 CR +1 11/10/14, 16:58

    What about the locallang.xml in our UnitTests for core and extbase? Maybe we should rename them, too.
  7. Xavier Perseguers commented on patch set 2 CR +2 11/10/14, 18:29

    I agree with Stefan that those locallang*.xml files should be converted as XLIFF but this is out-of-scope for this very patch IMHO.
  8. Wouter Wolters commented on patch set 2 CR -1 11/11/14, 18:58

    Please check my comment. We have two option. 1. remove the double check or replace the last check with .php

    AbstractFunctionModule.php:221

    This is still the check for the locallang.php which is now renamed to xlf. See later in the if, the check is done again for the xlf file.
  9. Benni Mack commented on patch set 2 11/13/14, 15:48

    @xavier, could you please recheck here?
  10. Benni Mack uploaded patch set 3 12/08/14, 06:43

  11. Wouter Wolters commented on patch set 3 12/08/14, 08:16

    My comment from patchset 2 is still valid.
  12. Stefan Neufeind commented on patch set 3 12/08/14, 23:21

    AbstractFunctionModule.php:221

    Is this here still correct then?
  13. Christian Kuhn commented on patch set 3 CR +1 12/12/14, 20:17

    AbstractFunctionModule.php:221 Reply

    yeah, can be kept for now. only .php parsing is kicked, xml is still there for the time being.

    LanguageService.php:438

    Actually, this method is still called within the class, so the deprecation removal has to remove the callers and this protected method together. The deprecation is only thrown if .php ending is used, though, which is fine. There is no simple way around that, so I'm fine with that here.
  14. Christian Kuhn voted on patch set 3 V +1 12/12/14, 20:22

  15. Benni Mack uploaded patch set 4 12/12/14, 20:47

  16. Christian Kuhn voted on patch set 4 CR +1 V +1 12/12/14, 20:50

  17. Wouter Wolters voted on patch set 4 V +1 CR +1 12/12/14, 21:06

  18. Benni Mack voted on patch set 4 CR +2 V +2 12/12/14, 21:07

  19. Benni Mack merged patch set 4 12/12/14, 21:07