Moodle
  1. Moodle
  2. MDL-38352

Import fixed English strings (en_fix) into the main English pack

    Details

    • Type: Task Task
    • Status: Closed
    • Priority: Minor Minor
    • Resolution: Fixed
    • Affects Version/s: 2.3.4, 2.4.1, 2.5
    • Fix Version/s: 2.3.5, 2.4.2
    • Component/s: Language
    • Labels:
    • Rank:
      48239

      Description

      The en_fix lang pack has been created (see MDLSITE-1363) so that Helen (with the help from the community) can easily amend typos in English strings, as well as improve the overall wording of strings.

      It would be nice to have these strings included in minor releases this week.

      Also, it would help me if there was a mechanism (like adding a note into the pre-release checklist) to remind me to generate this patches for every minor release.

        Issue Links

          Activity

          Hide
          David Mudrak added a comment -

          Submitting for integration. Thanks Helen and all contributors for their precise work!

          Show
          David Mudrak added a comment - Submitting for integration. Thanks Helen and all contributors for their precise work!
          Hide
          Eloy Lafuente (stronk7) added a comment -

          Integrated (23, 24 & master), thanks!

          Just be noted that it was detected that some looong (multiline) string had been converted to 1-line looong string. But that didn't seem enough to reject all the changes.

          Ciao

          Show
          Eloy Lafuente (stronk7) added a comment - Integrated (23, 24 & master), thanks! Just be noted that it was detected that some looong (multiline) string had been converted to 1-line looong string. But that didn't seem enough to reject all the changes. Ciao
          Hide
          Eloy Lafuente (stronk7) added a comment -

          Passing by nobody based on dev comment.

          Show
          Eloy Lafuente (stronk7) added a comment - Passing by nobody based on dev comment.
          Hide
          David Monllaó added a comment -

          Hi,

          This commit is breaking a couple of behat tests because of the activities description fields changes.

          This solves the issues:

          Show
          David Monllaó added a comment - Hi, This commit is breaking a couple of behat tests because of the activities description fields changes. This solves the issues: repo: git://github.com/dmonllao/moodle.git branch: MDL-38352 -behat-fix diff: https://github.com/dmonllao/moodle/compare/c65e7fcbc8f8fcc6a1842cfa3d2e169c76a32f49...MDL-38352-behat-fix
          Hide
          Aparup Banerjee added a comment -

          Thanks David, thats integrated into master now.

          Show
          Aparup Banerjee added a comment - Thanks David, thats integrated into master now.
          Hide
          David Monllaó added a comment -

          Thanks Aparup

          Show
          David Monllaó added a comment - Thanks Aparup
          Hide
          Dan Poltawski added a comment -

          This change does not seem right to me, since it changes the official ISO name.

          diff --git a/lang/en/countries.php b/lang/en/countries.php
          index 190e57d..042edfc 100644
          — a/lang/en/countries.php
          +++ b/lang/en/countries.php
          @@ -158,7 +158,7 @@ $string['LS'] = 'Lesotho';
          $string['LT'] = 'Lithuania';
          $string['LU'] = 'Luxembourg';
          $string['LV'] = 'Latvia';
          -$string['LY'] = 'Libya';
          +$string['LY'] = 'State of Libya';
          $string['MA'] = 'Morocco';
          $string['MC'] = 'Monaco';
          $string['MD'] = 'Moldova, Republic Of';

          Show
          Dan Poltawski added a comment - This change does not seem right to me, since it changes the official ISO name. diff --git a/lang/en/countries.php b/lang/en/countries.php index 190e57d..042edfc 100644 — a/lang/en/countries.php +++ b/lang/en/countries.php @@ -158,7 +158,7 @@ $string ['LS'] = 'Lesotho'; $string ['LT'] = 'Lithuania'; $string ['LU'] = 'Luxembourg'; $string ['LV'] = 'Latvia'; -$string ['LY'] = 'Libya'; +$string ['LY'] = 'State of Libya'; $string ['MA'] = 'Morocco'; $string ['MC'] = 'Monaco'; $string ['MD'] = 'Moldova, Republic Of';
          Hide
          Dan Poltawski added a comment -

          I assume that fix came from before MDL-35750 was integrated, where I updated the list to the official names. (before that it was 'Libyan Arab Jamahiriya')

          I would propose reverting to the official ISO name (especially as it means my script in https://github.com/danpoltawski/moodle-iso-country-import will work properly).

          Show
          Dan Poltawski added a comment - I assume that fix came from before MDL-35750 was integrated, where I updated the list to the official names. (before that it was 'Libyan Arab Jamahiriya') I would propose reverting to the official ISO name (especially as it means my script in https://github.com/danpoltawski/moodle-iso-country-import will work properly).
          Hide
          Dan Poltawski added a comment -

          I've put a fix for this on git://github.com/danpoltawski/moodle.git MDL-38352

          https://github.com/danpoltawski/moodle/commit/dbf8c92f73d0f2ba6029c565fb765818824aa8ef

          Show
          Dan Poltawski added a comment - I've put a fix for this on git://github.com/danpoltawski/moodle.git MDL-38352 https://github.com/danpoltawski/moodle/commit/dbf8c92f73d0f2ba6029c565fb765818824aa8ef
          Hide
          Dan Poltawski added a comment -

          For the stable branches i'm got MDL-38112 open anyway.

          Show
          Dan Poltawski added a comment - For the stable branches i'm got MDL-38112 open anyway.
          Hide
          Eloy Lafuente (stronk7) added a comment - - edited

          Libya fixed in master with your patch, Dan.

          Show
          Eloy Lafuente (stronk7) added a comment - - edited Libya fixed in master with your patch, Dan.
          Hide
          Eloy Lafuente (stronk7) added a comment -

          If I'm not wrong, this is a pass, then. Feel free.

          Show
          Eloy Lafuente (stronk7) added a comment - If I'm not wrong, this is a pass, then. Feel free.
          Hide
          Helen Foster added a comment -

          Just noting that the Libya name change was reported as MDL-38056. I changed it to 'State of Libya' according to http://en.wikipedia.org/wiki/Libya because I didn't know about the official ISO name.

          Show
          Helen Foster added a comment - Just noting that the Libya name change was reported as MDL-38056 . I changed it to 'State of Libya' according to http://en.wikipedia.org/wiki/Libya because I didn't know about the official ISO name.
          Hide
          David Mudrak added a comment -

          I agree with Helen here. Regardless what ISO says, the reference mentioned in Wikipedia looks trustworthy. You know, these things may be pretty sensitive and have political connotations. It makes sense to follow Wikipedia in these cases as it is more flexible in respecting the current geo-political development than institutions like ISO. My +1 would be to revert the change on master.

          Show
          David Mudrak added a comment - I agree with Helen here. Regardless what ISO says, the reference mentioned in Wikipedia looks trustworthy. You know, these things may be pretty sensitive and have political connotations. It makes sense to follow Wikipedia in these cases as it is more flexible in respecting the current geo-political development than institutions like ISO. My +1 would be to revert the change on master.
          Hide
          Dan Poltawski added a comment -

          > may be pretty sensitive and have political connotations

          Yes, and thats exactly why we use the international standard for naming, so that we don't get involved. So lets follow that decision and stick with it.

          It looks like the 'State of Libya' is a relatively new change - so i'm sure ISO will catch up and can follow.

          Show
          Dan Poltawski added a comment - > may be pretty sensitive and have political connotations Yes, and thats exactly why we use the international standard for naming, so that we don't get involved. So lets follow that decision and stick with it. It looks like the 'State of Libya' is a relatively new change - so i'm sure ISO will catch up and can follow.
          Hide
          David Mudrak added a comment -

          Well, but we already have an exception for TW, right? See https://tracker.moodle.org/browse/MDL-15976?focusedCommentId=87207&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-87207 I do agree with using ISO to cover our back. I just think that respecting the decision of the General National Congress would be nice, instead of waiting for the whole ISO machinery.

          Anyway, just for the reference, this change was contributed by Joseph Rézeau in http://lang.moodle.org/local/amos/contrib.php?id=5433 and he links to http://www.libyaherald.com/2013/01/09/gnc-officially-renames-libya-the-state-of-libya-until-the-new-constitution/ as the source.

          Show
          David Mudrak added a comment - Well, but we already have an exception for TW, right? See https://tracker.moodle.org/browse/MDL-15976?focusedCommentId=87207&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-87207 I do agree with using ISO to cover our back. I just think that respecting the decision of the General National Congress would be nice, instead of waiting for the whole ISO machinery. Anyway, just for the reference, this change was contributed by Joseph Rézeau in http://lang.moodle.org/local/amos/contrib.php?id=5433 and he links to http://www.libyaherald.com/2013/01/09/gnc-officially-renames-libya-the-state-of-libya-until-the-new-constitution/ as the source.
          Hide
          Dan Poltawski added a comment -

          Yep, I don't agree with TW really, but it was the boss who done it.

          I don't think we should loose time making these sort of calls unless really necessary, we'll open the floodgates to lots of these sort of discussions. At the very least, wait until some of our users are complaining about it rather than having this theoretical argument. We are using the ISO names precisely to avoid this sort of situation.

          Also, the wikipedia use of it is hardly bulletproof:
          http://en.wikipedia.org/wiki/Talk:Libya#State_of_Libya.3F

          Show
          Dan Poltawski added a comment - Yep, I don't agree with TW really, but it was the boss who done it. I don't think we should loose time making these sort of calls unless really necessary, we'll open the floodgates to lots of these sort of discussions. At the very least, wait until some of our users are complaining about it rather than having this theoretical argument. We are using the ISO names precisely to avoid this sort of situation. Also, the wikipedia use of it is hardly bulletproof: http://en.wikipedia.org/wiki/Talk:Libya#State_of_Libya.3F
          Hide
          David Mudrak added a comment -

          OK. Thanks Dan. BTW I can exclude countries from en_fix processing (as I did with langconfig). As we have an external tool to look after it, it sounds like a good approach.

          Show
          David Mudrak added a comment - OK. Thanks Dan. BTW I can exclude countries from en_fix processing (as I did with langconfig). As we have an external tool to look after it, it sounds like a good approach.
          Hide
          Helen Foster added a comment - - edited

          Sorry, my comment was not meant to imply that we should use 'State of Libya' - I was just explaining why it was changed to that.

          I agree with using the official ISO name, and as Dan says, since 'State of Libya' is quite new, ISO is likely to catch up at some point.

          PS I've mentioned this issue in http://docs.moodle.org/dev/Moodle_2.4.2_release_notes highlighting the My Moodle -> My home change.

          Show
          Helen Foster added a comment - - edited Sorry, my comment was not meant to imply that we should use 'State of Libya' - I was just explaining why it was changed to that. I agree with using the official ISO name, and as Dan says, since 'State of Libya' is quite new, ISO is likely to catch up at some point. PS I've mentioned this issue in http://docs.moodle.org/dev/Moodle_2.4.2_release_notes highlighting the My Moodle -> My home change.
          Hide
          Eloy Lafuente (stronk7) added a comment -

          So "nobody" assumes the risks and pass this diligently. Thanks all!

          Show
          Eloy Lafuente (stronk7) added a comment - So "nobody" assumes the risks and pass this diligently. Thanks all!
          Hide
          Eloy Lafuente (stronk7) added a comment -

          This is valid for unlimited entries to the, soon to be unveiled, Moodle Codebase Gardens. It includes free access to all facilities.

          Personal and non-transferable to all assignees, reviewers and testers in this issue. Valid until switching to Blackboard (100000€ penalization will be applied).

          Thanks, closing as fixed!

          Show
          Eloy Lafuente (stronk7) added a comment - This is valid for unlimited entries to the, soon to be unveiled, Moodle Codebase Gardens. It includes free access to all facilities. Personal and non-transferable to all assignees, reviewers and testers in this issue. Valid until switching to Blackboard (100000€ penalization will be applied). Thanks, closing as fixed!

            People

            • Votes:
              1 Vote for this issue
              Watchers:
              6 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: