Moodle
  1. Moodle
  2. MDL-44425

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.5.5, 2.6.2, 2.7
    • Fix Version/s: 2.5.5, 2.6.2
    • 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
            CiBoT added a comment -

            Results for MDL-44425

            • Remote repository: git://github.com/mudrd8mz/moodle.git
            Show
            CiBoT added a comment - Results for MDL-44425 Remote repository: git://github.com/mudrd8mz/moodle.git Remote branch MDL-44425 -enfix_25 to be integrated into upstream MOODLE_25_STABLE Executed job http://integration.moodle.org/job/Precheck%20remote%20branch/1896 Details: http://integration.moodle.org/job/Precheck%20remote%20branch/1896/artifact/work/smurf.html Remote branch MDL-44425 -en_fix_26 to be integrated into upstream MOODLE_26_STABLE Executed job http://integration.moodle.org/job/Precheck%20remote%20branch/1897 Details: http://integration.moodle.org/job/Precheck%20remote%20branch/1897/artifact/work/smurf.html Remote branch MDL-44425 -en_fix to be integrated into upstream master Executed job http://integration.moodle.org/job/Precheck%20remote%20branch/1898 Details: http://integration.moodle.org/job/Precheck%20remote%20branch/1898/artifact/work/smurf.html
            Hide
            David Mudrak added a comment -

            Submitting for integration. Credit goes to Helen Foster as usually

            Show
            David Mudrak added a comment - Submitting for integration. Credit goes to Helen Foster as usually
            Hide
            Dan Poltawski added a comment - - edited

            Hi David/Helen,

            I notice that we are renaming a country away from the ISO-3166 officially recognised name:
            https://www.iso.org/obp/ui/#iso:code:3166:MK

            I don't think we should be doing this as it is our policy to only follow the ISO naming scheme in order that we do not get involved in political disputes (excepting Taiwan, where Martin made the call: https://tracker.moodle.org/browse/MDL-15976?focusedCommentId=87207&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-87207).

            Actually i'm subscribed to the ISO list for naming and by weird coincidence I just created MDL-44433 for Cabo Verde before seeing this issue..

            Show
            Dan Poltawski added a comment - - edited Hi David/Helen, I notice that we are renaming a country away from the ISO-3166 officially recognised name: https://www.iso.org/obp/ui/#iso:code:3166:MK I don't think we should be doing this as it is our policy to only follow the ISO naming scheme in order that we do not get involved in political disputes (excepting Taiwan, where Martin made the call: https://tracker.moodle.org/browse/MDL-15976?focusedCommentId=87207&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-87207 ). Actually i'm subscribed to the ISO list for naming and by weird coincidence I just created MDL-44433 for Cabo Verde before seeing this issue..
            Hide
            Dan Poltawski added a comment -

            Also, I don't think that it is appropriate to change the name of the microsoft skydrive plugin in 2.6. This is something we avoid in order to prevent documentation getting out of date (or requiring two versions of documentation for one version) its also not nice to have the UI change on people.

            Show
            Dan Poltawski added a comment - Also, I don't think that it is appropriate to change the name of the microsoft skydrive plugin in 2.6. This is something we avoid in order to prevent documentation getting out of date (or requiring two versions of documentation for one version) its also not nice to have the UI change on people.
            Hide
            David Mudrak added a comment -

            Oh, my bad I didn't review the change. I thought that the country name is taken from the ISO. Sorry.

            WRT the repository, I think we should make an exception here. It was not us who changed the name of the product. So we really have to choose between two evils - either call something with a wrong name, or have some docs outdated (although they are always outdated). In this sort of case, I think we should change the name for now and everywhere we can.

            Show
            David Mudrak added a comment - Oh, my bad I didn't review the change. I thought that the country name is taken from the ISO. Sorry. WRT the repository, I think we should make an exception here. It was not us who changed the name of the product. So we really have to choose between two evils - either call something with a wrong name, or have some docs outdated (although they are always outdated). In this sort of case, I think we should change the name for now and everywhere we can.
            Hide
            Dan Poltawski added a comment -

            Note that on the repository, we have an existing precedent - Google Docs was not rebranded Google Drive until we changed to their new API..

            Show
            Dan Poltawski added a comment - Note that on the repository, we have an existing precedent - Google Docs was not rebranded Google Drive until we changed to their new API..
            Hide
            David Mudrak added a comment -

            OK. Let me amend the patches today then. Thanks for the review.

            Show
            David Mudrak added a comment - OK. Let me amend the patches today then. Thanks for the review.
            Hide
            David Mudrak added a comment -
            Show
            David Mudrak added a comment - For the record: http://en.wikipedia.org/wiki/Macedonia_naming_dispute
            Hide
            Mary Cooch added a comment -

            Dan Poltawski The 2.6 docs were changed last week with a redirect from the Skdrive page to OneDrive and a mention in the Onedrive page that it used to be called Skydrive http://docs.moodle.org/26/en/Skydrive_repository
            Are you saying we should have left it as it was?

            Show
            Mary Cooch added a comment - Dan Poltawski The 2.6 docs were changed last week with a redirect from the Skdrive page to OneDrive and a mention in the Onedrive page that it used to be called Skydrive http://docs.moodle.org/26/en/Skydrive_repository Are you saying we should have left it as it was?
            Hide
            David Mudrak added a comment -

            I just improved the AMOS interface so that it does not allow modifying countries.php strings for the en_fix component any more, to prevent this sort of issues in the future. Eventual importing of the upstream ISO-3166 names should be processed via normal code integration workflow.

            Show
            David Mudrak added a comment - I just improved the AMOS interface so that it does not allow modifying countries.php strings for the en_fix component any more, to prevent this sort of issues in the future. Eventual importing of the upstream ISO-3166 names should be processed via normal code integration workflow.
            Hide
            Helen Foster added a comment -

            Sorry if I was wrong in changing the name 'Macedonia (the former Yugoslav Republic of)', reported as MDL-29641. I didn't know about the ISO list.

            Show
            Helen Foster added a comment - Sorry if I was wrong in changing the name 'Macedonia (the former Yugoslav Republic of)', reported as MDL-29641 . I didn't know about the ISO list.
            Hide
            David Mudrak added a comment -

            Dan Poltawski or maybe Martin Dougiamas, can you please comment in MDL-29641 and explain the reporter why we refused their suggestion. I must admit they have my sympathy but I fully understand the Moodle position of being strict with ISO in 99% of cases.

            WRT the SkyDrive rename, I must say I am not sure now. With all the respect to integrators, this is really something our documentation fairy should decide. And it seems that Mary Cooch prefers having it renamed it everywhere now and for ever (read: until Microsoft renames it again). There is no point of keeping a documentation for product XX in our docs, if it is not its name any more. Again, this is two evils choice. I personally believe that renaming everywhere now is the lesser one.

            Show
            David Mudrak added a comment - Dan Poltawski or maybe Martin Dougiamas , can you please comment in MDL-29641 and explain the reporter why we refused their suggestion. I must admit they have my sympathy but I fully understand the Moodle position of being strict with ISO in 99% of cases. WRT the SkyDrive rename, I must say I am not sure now. With all the respect to integrators, this is really something our documentation fairy should decide. And it seems that Mary Cooch prefers having it renamed it everywhere now and for ever (read: until Microsoft renames it again). There is no point of keeping a documentation for product XX in our docs, if it is not its name any more. Again, this is two evils choice. I personally believe that renaming everywhere now is the lesser one.
            Hide
            Dan Poltawski added a comment - - edited

            Mary: I leave that that decision for you as its not really my area!

            But.. I don't think we should be changing the name of things on the stable branches (e.g. 2.6). If you had written a book on Moodle 2.6, or had a training course manual - wouldn't you find it frustrating that we make it out of date/inaccurate for Moodle 2.6.2? (We're not always good about this in Moodle, so I imagine that you've been frustrated with us many times )

            David: I've responded to that country naming issue, I also have complete sympathy for the reporter. But I also recognise that I might have sympathy for two apposing sides in a disputed country and its hard enough making integration review decisions so following a standard seems like the right call (though perhaps there is a better one which updates quickly).

            I agree that Mary is the better person to object to the skydrive naming change and its not as straight forward as normal because an external service is involved. I'm going to ask for some more opinions.

            Show
            Dan Poltawski added a comment - - edited Mary: I leave that that decision for you as its not really my area! But.. I don't think we should be changing the name of things on the stable branches (e.g. 2.6). If you had written a book on Moodle 2.6, or had a training course manual - wouldn't you find it frustrating that we make it out of date/inaccurate for Moodle 2.6.2? (We're not always good about this in Moodle, so I imagine that you've been frustrated with us many times ) David: I've responded to that country naming issue, I also have complete sympathy for the reporter. But I also recognise that I might have sympathy for two apposing sides in a disputed country and its hard enough making integration review decisions so following a standard seems like the right call (though perhaps there is a better one which updates quickly). I agree that Mary is the better person to object to the skydrive naming change and its not as straight forward as normal because an external service is involved. I'm going to ask for some more opinions.
            Hide
            David Mudrak added a comment -

            Stable UI is nice but pure theory. I can understand that from English speaking integrator's point of view, UI and terminology should just be stable. But being a translator of Moodle, I have learnt it just does not happen. Things are being localised slowly and improved/fixed continuously. Non-English UI is changed much more frequently typically. And for example, it's almost impossible to write a book on Moodle 2.6 because the localisation is usually just not there in time for most languages.

            Also, this change is happening during a minor version release. It should be mentioned in release notes and then I think we are well covered. And by the way, looking at previous en_fix merges. We do change UI strings in stable branches and I am not aware of complaints from users.

            Anyway, leaving the final decision up to doc fairy. Mary Cooch, please let me know asap so I can prepare the patches for integration here. tia.

            Show
            David Mudrak added a comment - Stable UI is nice but pure theory. I can understand that from English speaking integrator's point of view, UI and terminology should just be stable. But being a translator of Moodle, I have learnt it just does not happen. Things are being localised slowly and improved/fixed continuously. Non-English UI is changed much more frequently typically. And for example, it's almost impossible to write a book on Moodle 2.6 because the localisation is usually just not there in time for most languages. Also, this change is happening during a minor version release. It should be mentioned in release notes and then I think we are well covered. And by the way, looking at previous en_fix merges. We do change UI strings in stable branches and I am not aware of complaints from users. Anyway, leaving the final decision up to doc fairy. Mary Cooch , please let me know asap so I can prepare the patches for integration here. tia.
            Hide
            Mary Cooch added a comment -

            Personally I would go for changing its name now, rather than later.

            Show
            Mary Cooch added a comment - Personally I would go for changing its name now, rather than later.
            Hide
            David Mudrak added a comment -

            OK. So, paradoxically, as a result of the discussion here, not only we will call it OneDrive from now on. Mary and I also looked at the remaining places where we still refer to Box.net and Google Docs and made them all consistently use Box and Google Drive, respectively. We should put a note into the release notes that we reflected the remote service name changes or so.

            Branches updated, please re-review and pull.

            Show
            David Mudrak added a comment - OK. So, paradoxically, as a result of the discussion here, not only we will call it OneDrive from now on. Mary and I also looked at the remaining places where we still refer to Box.net and Google Docs and made them all consistently use Box and Google Drive, respectively. We should put a note into the release notes that we reflected the remote service name changes or so. Branches updated, please re-review and pull.
            Hide
            CiBoT added a comment -

            Results for MDL-44425

            • Remote repository: git://github.com/mudrd8mz/moodle.git
            Show
            CiBoT added a comment - Results for MDL-44425 Remote repository: git://github.com/mudrd8mz/moodle.git Remote branch MDL-44425 -enfix_25 to be integrated into upstream MOODLE_25_STABLE Executed job http://integration.moodle.org/job/Precheck%20remote%20branch/1935 Details: http://integration.moodle.org/job/Precheck%20remote%20branch/1935/artifact/work/smurf.html Remote branch MDL-44425 -en_fix_26 to be integrated into upstream MOODLE_26_STABLE Executed job http://integration.moodle.org/job/Precheck%20remote%20branch/1936 Details: http://integration.moodle.org/job/Precheck%20remote%20branch/1936/artifact/work/smurf.html Remote branch MDL-44425 -en_fix to be integrated into upstream master Executed job http://integration.moodle.org/job/Precheck%20remote%20branch/1937 Details: http://integration.moodle.org/job/Precheck%20remote%20branch/1937/artifact/work/smurf.html
            Hide
            Eloy Lafuente (stronk7) added a comment - - edited

            Stealing this from Dan...

            1) I think it's ok to rename those services. Just, please, add a note about the changes in 2.5.5 and 2.6.2 release notes.

            2) Agree about Macedonia. All we can do is to be 100% sticky to the ISO reference (I don't understand why the name has not been changed there, but the fact is that it's still there). And also, recommend to use any local lang customization to "fix" it whenever needed/hurting.

            Said that... reviewing...

            Edited: Fixing target versions.

            Show
            Eloy Lafuente (stronk7) added a comment - - edited Stealing this from Dan... 1) I think it's ok to rename those services. Just, please, add a note about the changes in 2.5.5 and 2.6.2 release notes. 2) Agree about Macedonia. All we can do is to be 100% sticky to the ISO reference (I don't understand why the name has not been changed there, but the fact is that it's still there). And also, recommend to use any local lang customization to "fix" it whenever needed/hurting. Said that... reviewing... Edited: Fixing target versions.
            Hide
            Eloy Lafuente (stronk7) added a comment -

            Integrated (25, 26 & master), thanks!

            Show
            Eloy Lafuente (stronk7) added a comment - Integrated (25, 26 & master), thanks!
            Hide
            Rajesh Taneja added a comment -

            Will wait for behat to run on nightly and will pass it tomorrow.
            Sorry this missed today's run.

            Trying to run locally, but with other things it might not be possible to run it on all 3 branches.

            Show
            Rajesh Taneja added a comment - Will wait for behat to run on nightly and will pass it tomorrow. Sorry this missed today's run. Trying to run locally, but with other things it might not be possible to run it on all 3 branches.
            Hide
            Mary Cooch added a comment -

            Docs have been updated in 2.5 and 2.6 to reflect the new naming, with redirects from and mentions of the old names so people don't get confused. I'll leave the docs_required label for now as a reminder that it needs to be mentioned in the Release notes. Happy to add it to release notes myself but I'm a bit unsure of which heading it would come under (UI change?)

            Show
            Mary Cooch added a comment - Docs have been updated in 2.5 and 2.6 to reflect the new naming, with redirects from and mentions of the old names so people don't get confused. I'll leave the docs_required label for now as a reminder that it needs to be mentioned in the Release notes. Happy to add it to release notes myself but I'm a bit unsure of which heading it would come under (UI change?)
            Hide
            Eloy Lafuente (stronk7) added a comment -

            '~@javascript' passing for 25, 26 and master (44, 78 and 82 scenarios OK).

            '@javascript' passing for 25, 26 and master (195, 234 and 237 scenarios OK).

            (at the time I'm writing this nightly is still @ B6.2 and B7.2... so I think I'm not going to wait for it to finish).

            So passing this on behalf of Rajesh, ciao

            Show
            Eloy Lafuente (stronk7) added a comment - '~@javascript' passing for 25, 26 and master (44, 78 and 82 scenarios OK). '@javascript' passing for 25, 26 and master (195, 234 and 237 scenarios OK). (at the time I'm writing this nightly is still @ B6.2 and B7.2... so I think I'm not going to wait for it to finish). So passing this on behalf of Rajesh, ciao
            Hide
            Eloy Lafuente (stronk7) added a comment -

            For fun: http://www.youtube.com/watch?v=IGENkpaPkgw

            Many thanks for your hard work, this is now part of Moodle!

            Ciao

            Show
            Eloy Lafuente (stronk7) added a comment - For fun: http://www.youtube.com/watch?v=IGENkpaPkgw Many thanks for your hard work, this is now part of Moodle! Ciao
            Hide
            Mary Cooch added a comment -

            Removing docs_required label and notes added to Release notes.

            Show
            Mary Cooch added a comment - Removing docs_required label and notes added to Release notes.
            Show
            Dan Poltawski added a comment - - edited Just noting this issue introduced a regression fixed by the next import in portfolio box.net ( MDL-45410 ): http://git.moodle.org/gw?p=integration.git;a=blobdiff;f=portfolio/boxnet/lang/en/portfolio_boxnet.php;h=435857b94cf926116f142b51d48f012cfb8eaccb;hp=5732285d8a6c6b9efe5ccb34db2ac782a6d64856;hb=e6cb9d833b08dfa249004fe67810c20cffa1459d;hpb=b001cabae351228e54c4d47a4b33ba1f85930357

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved: