Moodle
  1. Moodle
  2. MDL-42728

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.4.7, 2.5.3
    • Fix Version/s: 2.4.7, 2.5.3
    • Component/s: Language
    • Labels:
    • Rank:
      54576

      Description

      As a part of regular release process, en_fix pack from AMOS should be merged into the core English language

        Issue Links

          Activity

          Hide
          David Mudrak added a comment -

          Post-clone cleanup.

          Show
          David Mudrak added a comment - Post-clone cleanup.
          Hide
          David Mudrak added a comment -

          Submitting for integration. Thanks Helen Foster for your work on this.

          Show
          David Mudrak added a comment - Submitting for integration. Thanks Helen Foster for your work on this.
          Hide
          Dan Poltawski added a comment -

          As David Mo mentioned the other day, we need to do a full behat run on these to make sure its not going to cause all kinds of failures.

          I will try that now.

          Show
          Dan Poltawski added a comment - As David Mo mentioned the other day, we need to do a full behat run on these to make sure its not going to cause all kinds of failures. I will try that now.
          Hide
          Dan Poltawski added a comment -

          Looks good on master:
          281 scenarios (281 passed)
          6058 steps (6058 passed)
          203m27.606s

          Show
          Dan Poltawski added a comment - Looks good on master: 281 scenarios (281 passed) 6058 steps (6058 passed) 203m27.606s
          Hide
          Dan Poltawski added a comment -

          The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

          TIA and ciao

          Show
          Dan Poltawski added a comment - The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week. TIA and ciao
          Hide
          Eloy Lafuente (stronk7) added a comment -

          FYI, it seems that, in master, you are re-introducing a missing string (lang/en/moodle.php):

          <<<<<<< HEAD
          =======
          $string['resortselectedcategoriesby'] = 'Re-sort subcategories of selected categories';
          >>>>>>> FETCH_HEAD
          
          Show
          Eloy Lafuente (stronk7) added a comment - FYI, it seems that, in master, you are re-introducing a missing string (lang/en/moodle.php): <<<<<<< HEAD ======= $string['resortselectedcategoriesby'] = 'Re-sort subcategories of selected categories'; >>>>>>> FETCH_HEAD
          Hide
          Dan Poltawski added a comment -

          I've integrated this - thanks.

          I removed that added string. I will run behat now again.

          Show
          Dan Poltawski added a comment - I've integrated this - thanks. I removed that added string. I will run behat now again.
          Hide
          David Mudrak added a comment -

          Thanks guys. Correct - when those en_fix branches were created, the string was still in moodle.git. Thanks for spotting it.

          Show
          David Mudrak added a comment - Thanks guys. Correct - when those en_fix branches were created, the string was still in moodle.git. Thanks for spotting it.
          Hide
          David Monllaó added a comment -

          Waiting for the CI server to finish, I see 2 failures, once the job is finished I will check if they are caused by those language strings changes.

          Show
          David Monllaó added a comment - Waiting for the CI server to finish, I see 2 failures, once the job is finished I will check if they are caused by those language strings changes.
          Hide
          David Monllaó added a comment -

          sorry Dan, I didn't see your comment above, passing it.

          Show
          David Monllaó added a comment - sorry Dan, I didn't see your comment above, passing it.
          Hide
          Damyon Wiese added a comment -

          Here lies 52 bugs.
          All fixed or swept under a rug.
          If they come back one day,
          To our dismay,
          We all will feel quite un-smug.

          Thanks for the reporting/fixing/testing on this issue. It has been sent upstream.

          Show
          Damyon Wiese added a comment - Here lies 52 bugs. All fixed or swept under a rug. If they come back one day, To our dismay, We all will feel quite un-smug. Thanks for the reporting/fixing/testing on this issue. It has been sent upstream.

            People

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

              Dates

              • Created:
                Updated:
                Resolved: