Uploaded image for project: 'Moodle'
  1. Moodle
  2. MDL-43590

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

    Details

    • Type: Task
    • Status: Closed
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: 2.5.3, 2.6, 2.7
    • Fix Version/s: 2.5.4, 2.6.1
    • Component/s: Language
    • Labels:

      Description

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

        Gliffy Diagrams

          Issue Links

            Activity

            Hide
            mudrd8mz David Mudrak added a comment -

            This en_fix release mostly addresses MDL-34294.

            Show
            mudrd8mz David Mudrak added a comment - This en_fix release mostly addresses MDL-34294 .
            Hide
            mudrd8mz David Mudrak added a comment -

            Submitting for integration.

            Show
            mudrd8mz David Mudrak added a comment - Submitting for integration.
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            Integrated (25,2 6 & master), thanks!

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - Integrated (25,2 6 & master), thanks!
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            I'm passing this, no matter of that I've created MDL-43646 to fix a regression in a test caused by the "disapprove => unapprove" change.

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - I'm passing this, no matter of that I've created MDL-43646 to fix a regression in a test caused by the "disapprove => unapprove" change.
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            I'm adding the docs_required label here as far as it's likely the "unapprove" (or whatever is finally decided) may be present in moodle docs and would need amending.

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - I'm adding the docs_required label here as far as it's likely the "unapprove" (or whatever is finally decided) may be present in moodle docs and would need amending.
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment - - edited

            Ok, so finally it has been decided that:

            • In 26 and master (where the undo feature was introduced), change current "unapprove" to "undo approval".
            • In 25, by mistake, in this issue, the "approve" capability of both data and glossary was changed from "Approve unapproved entries" to "Approve and unapprove entries". We'll revert it to the original and try to understand why that change happened (asking David Mudrak just in case is some sort of bug).

            Doing...

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - - edited Ok, so finally it has been decided that: In 26 and master (where the undo feature was introduced), change current "unapprove" to "undo approval". In 25, by mistake, in this issue, the "approve" capability of both data and glossary was changed from "Approve unapproved entries" to "Approve and unapprove entries". We'll revert it to the original and try to understand why that change happened (asking David Mudrak just in case is some sort of bug). Doing...
            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - Ok, here are the candidate commits: 25_STABLE https://github.com/stronk7/moodle/commit/612ca7327de71d461c35a545116ee29f1b14e326 26_STABLE https://github.com/stronk7/moodle/commit/d339d412740098af5ed8bbd6460a15afc2e7d6be master https://github.com/stronk7/moodle/commit/7123ae8f9a841e2746f02bb003dbb08149f16eef Please verify all them look ok and I'll proceed.
            Hide
            tsala Helen Foster added a comment -

            Everything looks perfect! Many thanks to our en lang expert!

            Show
            tsala Helen Foster added a comment - Everything looks perfect! Many thanks to our en lang expert!
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            LOL, pushed! Thanks!

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - LOL, pushed! Thanks!
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            Closing as fixed.

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - Closing as fixed.
            Hide
            tsala Helen Foster added a comment -

            Removing docs_required label as all instances of 'unapprove' have been changed to 'undo approval'.

            Show
            tsala Helen Foster added a comment - Removing docs_required label as all instances of 'unapprove' have been changed to 'undo approval'.

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Fix Release Date:
                  13/Jan/14