En picks/sync from fork day #214
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
GTM apart from the various upgrade steps. Asking the release engineer to turn various upgrade_to_NNN01 upgrade_to_NNN02 into individual functions is prone to error with no definite value. The old ones will have been tested and people running from master the new ones will not have been tested. Small errors can easily come in and we waste time on release engineering which has minimal value. Remember also that we aim for master is always be runnable, so with this master can now be in a weird state where they can't upgrade because you are already ahead of the upgrade path. I don't see an upgrade cost doing each function on its own. So really confused why this is even needed. |
|
If these are to be merged, can it be done before Monday? This conflicts with my stats branch in a way that wont show up on git (migrations). Edit: Sorry, meant to comment on the pootle_store commit. |
|
Implemented most of the required changes. Please review again. |
|
Otherwise GTM |
… one Pick notes: Some of the changes are not interesting for us. Other changes were undone in: - evernote/pootle@373fbfb9 - evernote/pootle@933b03f1 - evernote/pootle@6bb67a86 and to avoid picking extra commits we just pick here the commits that are not undone and that are insteresting for us. Conflicts: pootle/templates/layout.html
…r locale names will fail; so just set the default locale and quit early. This will avoid polluting the logs with numerous 'Failed to set locale' debug messages Conflicts: pootle/middleware/setlocale.py
Conflicts: pootle/templates/admin/dashboard.html pootle/templates/home/home.html
Picking this required extensive changes due to the huge differences between Evernote code and our code in this specific view. Conflicts: pootle/apps/pootle_translationproject/views.py
Conflicts: pootle/apps/pootle_store/models.py
Pick notes: - Changed name of the migration to keep the numbering. - Created the migration again, since we did additional changes to the model.
Conflicts: pootle/apps/pootle_statistics/models.py
Conflicts: pootle/apps/pootle_store/models.py
Views only check a single permission at a time. Conflicts: pootle/core/decorators.py
Pick notes: The migration was recreated and renamed. Conflicts: pootle/apps/pootle_store/models.py
There was some references to the code dropped in the previous commit, so we removed them. But since they were on the upgrade code, removing part of that code rendered it useless, so we dropped the upgrade path for the ancient Pootle versions (2.1.0 and older). So to avoid surprises we added a check in the setup command to warn people that they are trying to upgrade from a really old version and ask them to do an intermediate upgrade. Added a note about this on the upgrade instructions and included references in the release notes as well.
Added some additional unused imports when picking. Conflicts: pootle/apps/pootle_language/views.py pootle/apps/pootle_project/views.py pootle/apps/pootle_store/models.py pootle/urls.py tests/fixtures/models/project.py
Conflicts: docs/server/settings.rst pootle/i18n/gettext_live.py pootle/i18n/override.py
Pick note: Only picked the part for removing live translation. Conflicts: pootle/depcheck.py
Pick notes: Instead of adding the new user using a migration, some code was added to the upgrade path. Conflicts: pootle/apps/pootle_app/management/__init__.py pootle/apps/pootle_store/models.py
Conflicts: pootle/apps/pootle_language/views.py pootle/apps/pootle_project/views.py
Pick note: This is removing the server description from the home page, including the text and the inline form to edit it. Conflicts: pootle/apps/pootle_app/views/admin/adminpages.py pootle/apps/pootle_app/views/admin/urls.py pootle/apps/pootle_app/views/index/index.py pootle/templates/home/home.html
Conflicts: pootle/apps/pootle_store/models.py
This prevents separators between select2 controls from being shown first Conflicts: pootle/static/css/style.css
Notes: at MT init time, the targetLanguage member seem to be missing; the target language is now taken on editor "ready" event, when it is gathered from <textarea lang="..."> attribute (there should be a cleaner way to store and retrieve the source and target languages than it is now). Also: was there a reason to store the 'targetLang' as a propery of the plugin? I removed that code. Especially now that the target language can be different across units.
…slation' and 'suggestions' values Pick note: It is not necessary to pick the rest of the changes since they were already brought in. Conflicts: pootle/templates/core/_table_row.html
According to docs: "Using the --cleanup command line option, languages added to projects that no longer have matching files on the filesystem will be deleted.". However, the code would not only delete missing languages in projects (aka "translation projects"), but would also delete projects themselves. This has proven to be troublesome. For now, the --cleanup option will only affect translation projects. One can imagine a separate explicit "--delete-missing-projects" options to unregister projects as well. Pick note: Wrapped the description above so the line doesn't span forever, because commit messages must be readable.
…endering; use better vertical alignment
…ew to model Conflicts: pootle/apps/pootle_store/models.py pootle/apps/pootle_store/views.py
julen
added a commit
to julen/pootle
that referenced
this pull request
Jun 20, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There is still a lot of much more work to pick, but lets start merging stuff.