Merge remote-tracking branch 'origin/master'

accounts/migrations/0001_initial.py

@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models

accounts/migrations/0002_subscriptions.py

@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models

accounts/migrations/0003_auto__add_field_profile_subscribe_new_comment.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

accounts/migrations/0004_auto__add_field_profile_subscribe_merge_failure.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

accounts/migrations/0005_auto__add_field_profile_subscribe_new_language.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

docs/_ext/djangodocs.py

@@ -5,8 +5,6 @@ import json
 import os
 import re
 
-from docutils import nodes, transforms
-
 from sphinx import addnodes, roles, __version__ as sphinx_ver
 from sphinx.builders.html import StandaloneHTMLBuilder
 from sphinx.writers.html import SmartyPantsHTMLTranslator

lang/migrations/0001_initial.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

lang/migrations/0002_auto__add_field_language_direction.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

lang/migrations/0003_auto__add_field_language_plural_type.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

lang/migrations/0004_fill_in_plural_type.py

@@ -17,10 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
 from lang.models import get_plural_type
 
 

trans/migrations/0001_initial.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0002_add_subproject_locking.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0003_add_translation_disabling.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0004_add_new_language_choice.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0005_add_vcs_config_to_project.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0006_add_push_on_commit.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0007_add_language_code.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0008_add_translation_locking.py

@@ -20,7 +20,6 @@
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0009_add_set_translation_team.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0010_add_merge_style.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0011_add_file_format.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0012_enlarge_revision.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0013_auto__add_field_subproject_report_source_bugs.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0014_auto__chg_field_check_language.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0015_auto__add_field_indexupdate_source.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0016_auto__add_comment.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0017_auto__add_field_change_action.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0018_auto__add_field_change_translation.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0019_fill_in_translation_reference.py

@@ -17,10 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
 
 class Migration(DataMigration):
 

trans/migrations/0020_auto__chg_field_change_translation__chg_field_change_unit.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0021_auto__chg_field_change_user.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0022_auto__add_field_subproject_allow_translation_propagation.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0023_auto__chg_field_project_commit_message.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0024_auto__add_field_unit_previous_source.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0025_auto__add_field_project_enable_acl.py

@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0026_auto__add_unique_subproject_project_name__add_unique_subproject_projec.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0027_auto__chg_field_subproject_template.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0028_auto__chg_field_subproject_push.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0029_auto__add_field_translation_failing_checks.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0030_update_failing_checks.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
+
 
 class Migration(DataMigration):
 

trans/migrations/0031_auto__add_field_translation_have_suggestion.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0032_update_have_suggestion.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
+
 
 class Migration(DataMigration):
 

trans/migrations/0033_auto__add_field_subproject_extra_commit_file__add_field_subproject_pre.py

 # -*- coding: utf-8 -*-
-import datetime
+#
+# Copyright © 2012 - 2013 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0034_auto__add_field_subproject_git_export.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0035_auto__add_field_unit_has_suggestion__add_field_unit_has_comment__add_f.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0036_update_unit_stats.py

@@ -17,12 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 import time
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
 
 class Migration(DataMigration):
 

trans/migrations/0037_auto__add_field_translation_translated_words__add_field_translation_to.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0038_update_word_counts.py

 # -*- coding: utf-8 -*-
-import datetime
-from south.db import db
+#
+# Copyright © 2012 - 2013 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 from south.v2 import DataMigration
-from django.db import models
 from django.db.models import Sum
 
+
 class Migration(DataMigration):
 
     def forwards(self, orm):

trans/migrations/0039_auto__add_unique_check_project_checksum_check_language.py

 # -*- coding: utf-8 -*-
-import datetime
+#
+# Copyright © 2012 - 2013 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0040_change_plural_separator.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
+
 
 class Migration(DataMigration):
 

trans/migrations/0041_auto__add_field_subproject_save_history__add_field_change_target.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0042_auto__add_field_project_license__add_field_project_license_url.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0043_auto__add_vote__add_unique_vote_suggestion_user.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0044_auto__add_field_subproject_suggestion_voting__add_field_subproject_sug.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0045_auto__add_field_subproject_check_flags.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0046_auto__add_field_unit_contentsum.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0047_fill_in_contentsum.py

@@ -17,12 +17,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 import hashlib
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
+
 
 class Migration(DataMigration):
 

trans/migrations/0048_auto__add_field_check_contentsum__add_field_suggestion_contentsum__add.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0049_link_unitdata_on_contentsum.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
-from south.db import db
 from south.v2 import DataMigration
-from django.db import models
+
 
 class Migration(DataMigration):
 

trans/migrations/0050_auto__del_field_check_checksum__del_unique_check_project_checksum_chec.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0051_auto__add_field_translation_commit_message.py

@@ -17,11 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/migrations/0052_auto__add_field_subproject_new_base.py

 # -*- coding: utf-8 -*-
-import datetime
+#
+# Copyright © 2012 - 2013 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

trans/tests/exports.py

@@ -23,7 +23,7 @@ Tests for data exports.
 """
 
 from django.core.urlresolvers import reverse
-from django.utils import simplejson
+import json
 from trans.tests.views import ViewTestCase
 
 
@@ -56,7 +56,7 @@ class ExportsViewTest(ViewTestCase):
         response = self.client.get(
             reverse('export_stats', kwargs=self.kw_subproject)
         )
-        parsed = simplejson.loads(response.content)
+        parsed = json.loads(response.content)
         self.assertEqual(parsed[0]['name'], 'Czech')
 
     def test_data(self):

trans/tests/js_views.py

@@ -24,7 +24,7 @@ Tests for AJAX/JS views.
 
 from trans.tests.views import ViewTestCase
 from django.core.urlresolvers import reverse
-from django.utils import simplejson
+import json
 
 
 class JSViewsTest(ViewTestCase):
@@ -53,7 +53,7 @@ class JSViewsTest(ViewTestCase):
             {'service': 'dummy'}
         )
         self.assertContains(response, 'Ahoj')
-        data = simplejson.loads(response.content)
+        data = json.loads(response.content)
         self.assertEqual(
             data['translations'],
             [

trans/views/api.py

@@ -252,5 +252,5 @@ def export_stats(request, project, subproject):
             default=json_dt_handler,
             indent=indent,
         ),
-        mimetype='application/json'
+        content_type='application/json'
     )

trans/views/dictionary.py

@@ -158,7 +158,7 @@ def download_dictionary_ttkit(export_format, prj, lang, words):
         store = pofile()
 
         # Export parameters
-        mimetype = 'text/x-po'
+        content_type = 'text/x-po'
         extension = 'po'
         has_lang = False
 
@@ -182,12 +182,12 @@ def download_dictionary_ttkit(export_format, prj, lang, words):
         store = tbxfile()
 
         # Export parameters
-        mimetype = 'application/x-tbx'
+        content_type = 'application/x-tbx'
         extension = 'tbx'
         has_lang = True
 
     # Setup response and headers
-    response = HttpResponse(mimetype='%s; charset=utf-8' % mimetype)
+    response = HttpResponse(content_type='%s; charset=utf-8' % content_type)
     filename = 'glossary-%s-%s.%s' % (prj.slug, lang.code, extension)
     response['Content-Disposition'] = 'attachment; filename=%s' % filename
 
@@ -231,7 +231,7 @@ def download_dictionary(request, project, lang):
         return download_dictionary_ttkit(export_format, prj, lang, words)
 
     # Manually create CSV file
-    response = HttpResponse(mimetype='text/csv; charset=utf-8')
+    response = HttpResponse(content_type='text/csv; charset=utf-8')
     filename = 'dictionary-%s-%s.csv' % (prj.slug, lang.code)
     response['Content-Disposition'] = 'attachment; filename=%s' % filename
 

trans/views/files.py

@@ -40,7 +40,7 @@ def download_translation(request, project, subproject, lang):
     # Create response
     response = HttpResponse(
         file(srcfilename).read(),
-        mimetype=obj.store.mimetype
+        content_type=obj.store.mimetype
     )
 
     # Fill in response headers
@@ -59,7 +59,7 @@ def download_language_pack(request, project, subproject, lang):
     # Create response
     response = HttpResponse(
         obj.store.get_language_pack(),
-        mimetype=mime
+        content_type=mime
     )
 
     # Fill in response headers

trans/views/js.py

@@ -84,7 +84,7 @@ def translate(request, unit_id):
 
     return HttpResponse(
         json.dumps(response),
-        mimetype='application/json'
+        content_type='application/json'
     )
 
 
@@ -209,5 +209,5 @@ def js_config(request):
                 'machine_services': machine_services,
             }
         ),
-        mimetype='application/javascript'
+        content_type='application/javascript'
     )