diff --git a/pandora/annotation/management/commands/import_srt.py b/pandora/annotation/management/commands/import_srt.py index ef309f81..881aa186 100644 --- a/pandora/annotation/management/commands/import_srt.py +++ b/pandora/annotation/management/commands/import_srt.py @@ -27,7 +27,6 @@ class Command(BaseCommand): parser.add_argument('username', help='username') parser.add_argument('item', help='item') parser.add_argument('layer', help='layer') - parser.add_argument('language', help='language', default="") parser.add_argument('filename', help='filename.srt') def handle(self, *args, **options): @@ -35,7 +34,6 @@ class Command(BaseCommand): public_id = options['item'] layer_id = options['layer'] filename = options['filename'] - language = options.get("language") user = User.objects.get(username=username) item = Item.objects.get(public_id=public_id) @@ -49,9 +47,6 @@ class Command(BaseCommand): for i in range(len(annotations)-1): if annotations[i]['out'] == annotations[i+1]['in']: annotations[i]['out'] = annotations[i]['out'] - 0.001 - if language: - for annotation in annotations: - annotation["value"] = '%s' % (language, annotation["value"]) tasks.add_annotations.delay({ 'item': item.public_id, 'layer': layer_id, diff --git a/pandora/item/models.py b/pandora/item/models.py index be7f3303..f6d992c0 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -1559,8 +1559,6 @@ class Item(models.Model): return icon def add_empty_clips(self): - if not settings.EMPTY_CLIPS: - return subtitles = utils.get_by_key(settings.CONFIG['layers'], 'isSubtitles', True) if not subtitles: return diff --git a/pandora/settings.py b/pandora/settings.py index 7268c31c..f47379e5 100644 --- a/pandora/settings.py +++ b/pandora/settings.py @@ -289,8 +289,6 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') DATA_UPLOAD_MAX_MEMORY_SIZE = 32 * 1024 * 1024 -EMPTY_CLIPS = True - #you can ignore things below this line #========================================================================= LOCAL_APPS = []