Merge lp://qastaging/~danilo/launchpad/bug-869089 into lp://qastaging/launchpad

Proposed by Данило Шеган
Status: Merged
Approved by: Данило Шеган
Approved revision: no longer in the source branch.
Merged at revision: 14129
Proposed branch: lp://qastaging/~danilo/launchpad/bug-869089
Merge into: lp://qastaging/launchpad
Diff against target: 874 lines (+84/-159)
30 files modified
database/sampledata/current.sql (+3/-3)
lib/canonical/launchpad/database/launchpadstatistic.py (+1/-5)
lib/lp/app/interfaces/launchpad.py (+0/-3)
lib/lp/registry/browser/distribution.py (+2/-2)
lib/lp/registry/browser/tests/distribution-views.txt (+2/-2)
lib/lp/registry/configure.zcml (+0/-2)
lib/lp/registry/doc/distribution.txt (+2/-4)
lib/lp/registry/interfaces/projectgroup.py (+3/-2)
lib/lp/registry/model/distribution.py (+3/-24)
lib/lp/registry/model/product.py (+4/-29)
lib/lp/registry/model/projectgroup.py (+1/-5)
lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.txt (+7/-5)
lib/lp/registry/tests/test_service_usage.py (+0/-21)
lib/lp/translations/browser/distribution.py (+1/-1)
lib/lp/translations/browser/potemplate.py (+2/-2)
lib/lp/translations/browser/tests/test_baseexportview.py (+1/-4)
lib/lp/translations/browser/tests/test_distroserieslanguage_views.py (+0/-1)
lib/lp/translations/browser/tests/test_product_view.py (+7/-5)
lib/lp/translations/browser/tests/test_productserieslanguage_views.py (+0/-2)
lib/lp/translations/browser/tests/test_translationimportqueueentry.py (+2/-1)
lib/lp/translations/browser/tests/test_translationlinksaggregator.py (+9/-4)
lib/lp/translations/doc/potmsgset.txt (+4/-3)
lib/lp/translations/interfaces/hastranslationtemplates.py (+4/-6)
lib/lp/translations/model/potemplate.py (+7/-6)
lib/lp/translations/model/translationsperson.py (+2/-2)
lib/lp/translations/scripts/tests/test_cache_suggestive_templates.py (+9/-6)
lib/lp/translations/scripts/translations_to_branch.py (+2/-2)
lib/lp/translations/stories/standalone/xx-series-templates.txt (+2/-1)
lib/lp/translations/tests/test_pofile.py (+0/-1)
lib/lp/translations/tests/test_shared_potemplate.py (+4/-5)
To merge this branch: bzr merge lp://qastaging/~danilo/launchpad/bug-869089
Reviewer Review Type Date Requested Status
Benji York (community) code Approve
Review via email: mp+78819@code.qastaging.launchpad.net

Commit message

[r=benji][bug=677532,869089][incr] Good riddance to official_rosetta.

Description of the change

= Bug 869089 =

I was under the wrong impression that global suggestions have stopped working. However, the logic for updating the cached SuggestivePOTemplate table was using official_rosetta field instead.

So, I've decided to fix this (basically rosetta task of bug 627631, which has been marked 'fix released' for all of Launchpad, probably the migration to one single project losing the distinction), and the translations part of bug 677532 (because I had to :).

== Proposed fix ==

Use translations_usage directly everywhere instead of using official_rosetta. Good riddance to official_rosetta.

== Implementation details ==

One problem I hit was that the tests sampledata was not updated with the migration from official_rosetta to translations_usage, so I did that (that's why only current.sql is updated).

== Tests ==

bin/test -vvm lp.translations (though, I ran full test suite already and fixed problems that caused failing tests)

== Demo and Q/A ==

Make sure TranslationAdmins (eg. all of Launchpad team) can access translations.l.n/(project|distro)/+settings pages and change the "uses translations" setting.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  database/sampledata/current.sql
  lib/lp/registry/model/projectgroup.py
  lib/lp/registry/doc/distribution.txt
  lib/lp/translations/scripts/tests/test_cache_suggestive_templates.py
  lib/lp/translations/tests/test_pofile.py
  lib/lp/registry/configure.zcml
  lib/lp/translations/browser/distribution.py
  lib/lp/app/interfaces/launchpad.py
  lib/lp/translations/browser/tests/test_productserieslanguage_views.py
  lib/lp/registry/stories/distribution/xx-distribution-launchpad-usage.txt
  lib/lp/translations/browser/tests/test_baseexportview.py
  lib/lp/translations/browser/tests/test_distroserieslanguage_views.py
  lib/lp/translations/tests/test_shared_potemplate.py
  lib/lp/translations/browser/tests/test_translationimportqueueentry.py
  lib/lp/translations/browser/tests/test_translationlinksaggregator.py
  lib/lp/registry/interfaces/projectgroup.py
  lib/lp/translations/scripts/translations_to_branch.py
  lib/lp/registry/model/product.py
  lib/lp/registry/tests/test_service_usage.py
  lib/lp/registry/browser/tests/distribution-views.txt
  lib/canonical/launchpad/database/launchpadstatistic.py
  lib/lp/translations/model/translationsperson.py
  lib/lp/translations/interfaces/hastranslationtemplates.py
  lib/lp/translations/doc/potmsgset.txt
  lib/lp/registry/browser/distribution.py
  lib/lp/translations/model/potemplate.py
  lib/lp/registry/model/distribution.py
  lib/lp/translations/browser/tests/test_product_view.py
  lib/lp/translations/browser/potemplate.py

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

This branch looks good to me. It's nice to have this straightened out.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.