From abc3e66da5d34d8a4328fb36651c13d9b7b9859f Mon Sep 17 00:00:00 2001
From: Alan Velasco <AlanVelasco.A@gmail.com>
Date: Fri, 18 Dec 2020 19:49:00 -0700
Subject: [PATCH] Update translations file, remove backup migration

---
 warehouse/locale/messages.pot                 | 46 +++++++--------
 .../f65c7127ca5d_draft_releases.py.bak        | 59 -------------------
 2 files changed, 21 insertions(+), 84 deletions(-)
 delete mode 100644 warehouse/migrations/versions/f65c7127ca5d_draft_releases.py.bak

diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot
index dd1ace857115..377e82f95449 100644
--- a/warehouse/locale/messages.pot
+++ b/warehouse/locale/messages.pot
@@ -3378,12 +3378,12 @@ msgstr ""
 
 #: warehouse/templates/manage/release.html:147
 #: warehouse/templates/manage/release.html:181
-#: warehouse/templates/manage/release.html:203
+#: warehouse/templates/manage/release.html:202
 #: warehouse/templates/manage/releases.html:23
 #: warehouse/templates/manage/releases.html:143
 #: warehouse/templates/manage/releases.html:149
 #: warehouse/templates/manage/releases.html:162
-#: warehouse/templates/manage/releases.html:169
+#: warehouse/templates/manage/releases.html:171
 msgid "Version"
 msgstr ""
 
@@ -3444,23 +3444,14 @@ msgid ""
 "          "
 msgstr ""
 
-#: warehouse/templates/manage/release.html:153
-#: warehouse/templates/manage/releases.html:130
+#: warehouse/templates/manage/release.html:178
+#: warehouse/templates/manage/releases.html:159
 msgid "Reason (optional)"
 msgstr ""
 
-#: warehouse/templates/manage/release.html:156
-#: warehouse/templates/manage/release.html:177
-#: warehouse/templates/manage/releases.html:23
-#: warehouse/templates/manage/releases.html:120
-#: warehouse/templates/manage/releases.html:133
-#: warehouse/templates/manage/releases.html:142
-msgid "Version"
-msgstr ""
-
-#: warehouse/templates/manage/release.html:161
-#: warehouse/templates/manage/release.html:177
-#: warehouse/templates/manage/releases.html:136
+#: warehouse/templates/manage/release.html:186
+#: warehouse/templates/manage/release.html:202
+#: warehouse/templates/manage/releases.html:165
 msgid "Delete release"
 msgstr ""
 
@@ -3483,15 +3474,15 @@ msgstr[1] ""
 msgid "Deleting will irreversibly delete this release."
 msgstr ""
 
-#: warehouse/templates/manage/release.html:173
-#: warehouse/templates/manage/releases.html:138
+#: warehouse/templates/manage/release.html:198
+#: warehouse/templates/manage/releases.html:167
 msgid ""
 "You will not be able to re-upload a new distribution of the same type "
 "with the same version number."
 msgstr ""
 
-#: warehouse/templates/manage/release.html:174
-#: warehouse/templates/manage/releases.html:139
+#: warehouse/templates/manage/release.html:199
+#: warehouse/templates/manage/releases.html:168
 msgid ""
 "Deletion will break any downstream projects relying on a pinned version "
 "of this package. It is intended as a last resort to address legal issues "
@@ -3611,25 +3602,30 @@ msgstr ""
 msgid "Manage '%(project_name)s' releases"
 msgstr ""
 
-#: warehouse/templates/manage/releases.html:156
+#: warehouse/templates/manage/releases.html:185
+#, python-format
+msgid "Draft Releases (%(release_count)s)"
+msgstr ""
+
+#: warehouse/templates/manage/releases.html:190
 #, python-format
 msgid "Releases (%(release_count)s)"
 msgstr ""
 
-#: warehouse/templates/manage/releases.html:162
+#: warehouse/templates/manage/releases.html:196
 #, python-format
 msgid "Yanked Releases (%(release_count)s)"
 msgstr ""
 
-#: warehouse/templates/manage/releases.html:168
+#: warehouse/templates/manage/releases.html:202
 msgid "Creating a new release"
 msgstr ""
 
-#: warehouse/templates/manage/releases.html:170
+#: warehouse/templates/manage/releases.html:204
 msgid "No releases found"
 msgstr ""
 
-#: warehouse/templates/manage/releases.html:173
+#: warehouse/templates/manage/releases.html:207
 #, python-format
 msgid ""
 "Learn how to create a new release on the <a href=\"%(href)s\" "
diff --git a/warehouse/migrations/versions/f65c7127ca5d_draft_releases.py.bak b/warehouse/migrations/versions/f65c7127ca5d_draft_releases.py.bak
deleted file mode 100644
index f337fb10c7f1..000000000000
--- a/warehouse/migrations/versions/f65c7127ca5d_draft_releases.py.bak
+++ /dev/null
@@ -1,59 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""
-Draft Releases
-
-Revision ID: f65c7127ca5d
-Revises: 87509f4ae027
-Create Date: 2020-07-17 20:24:57.756179
-"""
-
-from alembic import op
-import sqlalchemy as sa
-
-
-revision = "f65c7127ca5d"
-down_revision = "87509f4ae027"
-
-# Note: It is VERY important to ensure that a migration does not lock for a
-#       long period of time and to ensure that each individual migration does
-#       not break compatibility with the *previous* version of the code base.
-#       This is because the migrations will be ran automatically as part of the
-#       deployment process, but while the previous version of the code is still
-#       up and running. Thus backwards incompatible changes must be broken up
-#       over multiple migrations inside of multiple pull requests in order to
-#       phase them in over multiple deploys.
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column("releases", sa.Column("project_name", sa.Text(), nullable=False))
-    op.create_foreign_key(None, "releases", "projects", ["project_name"], ["name"])
-    # ### end Alembic commands ###
-    op.execute(
-        """
-        CREATE FUNCTION make_draft_hash(project_name text, version text) returns text as $$
-                SELECT  md5(project_name || version)
-            $$
-            LANGUAGE SQL
-            IMMUTABLE
-            RETURNS NULL ON NULL INPUT;
-    """
-    )
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(None, "releases", type_="foreignkey")
-    op.drop_column("releases", "project_name")
-    # ### end Alembic commands ###
-    op.execute("DROP FUNCTION make_draft_hash")