Moodle

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

Details

  • Type: Task Task
  • Status: Closed 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:

Description

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

Issue Links

has a clone

Task - A task that needs to be completed. Tasks usually refer to work that must be done outside the product. MDL-41568 Import fixed English strings (en_fix) into the main English pack

  • Minor - Minor loss of function where workaround is possible
  • Closed - The issue is considered finished, the resolution is correct. Issues which are closed should not be reopened.
is a clone of

Task - A task that needs to be completed. Tasks usually refer to work that must be done outside the product. MDL-43590 Import fixed English strings (en_fix) into the main English pack

  • Minor - Minor loss of function where workaround is possible
  • Closed - The issue is considered finished, the resolution is correct. Issues which are closed should not be reopened.

Activity

Ascending order - Click to sort in descending order
Hide
Permalink
David Mudrak added a comment -

Post-clone cleanup.

Show
David Mudrak added a comment - Post-clone cleanup.
Hide
Permalink
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
Permalink
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
Permalink
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
Permalink
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
Permalink
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
Permalink
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
Permalink
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
Permalink
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
Permalink
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
Permalink
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

Vote (1)
Watch (2)

Dates

  • Created:
    Updated:
    Resolved: