diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-02-28 08:49:41 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-02-28 08:49:41 -0300 |
| commit | 0f1e24f7888ba16fe5629c57fd00f0deacb63e5e (patch) | |
| tree | 7153a3a11b766f375b1d1c0a7adc599e0a9f9c55 /nikola/plugins/command/import_wordpress.py | |
| parent | 04fc43563d3d5d4218004690b5e14c19c67bdcbc (diff) | |
| parent | 2828399ba5cbb14502b023d4de1ba02f13dd5055 (diff) | |
Merge tag 'upstream/6.3.0'
Upstream version 6.3.0
Diffstat (limited to 'nikola/plugins/command/import_wordpress.py')
| -rw-r--r-- | nikola/plugins/command/import_wordpress.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nikola/plugins/command/import_wordpress.py b/nikola/plugins/command/import_wordpress.py index 4f32198..0c9915a 100644 --- a/nikola/plugins/command/import_wordpress.py +++ b/nikola/plugins/command/import_wordpress.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright © 2012-2013 Roberto Alsina and others. +# Copyright © 2012-2014 Roberto Alsina and others. # Permission is hereby granted, free of charge, to any # person obtaining a copy of this software and associated @@ -145,7 +145,7 @@ class CommandImportWordpress(Command, ImportMixin): rendered_template = re.sub('# REDIRECTIONS = ', 'REDIRECTIONS = ', rendered_template) if self.timezone: - rendered_template = re.sub('# TIMEZONE = \'Europe/Zurich\'', + rendered_template = re.sub('# TIMEZONE = \'UTC\'', 'TIMEZONE = \'' + self.timezone + '\'', rendered_template) self.write_configuration(self.get_configuration_output_path(), |