change arg name lang_header to header_lang

Author: jdugh

src/formpack/pack.py

@@ -337,7 +337,8 @@ def to_json(self, **kwargs):
     def export(self, lang=UNSPECIFIED_TRANSLATION, group_sep='/', hierarchy_in_labels=False,
                versions=-1, multiple_select="both",
                force_index=False, copy_fields=(), title=None,
-               tag_cols_for_header=None, lang_header=-1):
+               header_lang=-1,
+               tag_cols_for_header=None):
         """
         Create an export for given versions of the form
         """
@@ -348,8 +349,8 @@ def export(self, lang=UNSPECIFIED_TRANSLATION, group_sep='/', hierarchy_in_label
                       version_id_keys=self.version_id_keys(versions),
                       title=title, multiple_select=multiple_select,
                       force_index=force_index, copy_fields=copy_fields,
-                      tag_cols_for_header=tag_cols_for_header,
-                      lang_header=lang_header)
+                      header_lang=header_lang,
+                      tag_cols_for_header=tag_cols_for_header)
 
     def autoreport(self, versions=-1):
         """

src/formpack/reporting/export.py

@@ -27,7 +27,7 @@ def __init__(self, formpack, form_versions, lang=UNSPECIFIED_TRANSLATION,
                  group_sep="/", hierarchy_in_labels=False,
                  version_id_keys=[],
                  multiple_select="both", copy_fields=(), force_index=False,
-                 title="submissions", tag_cols_for_header=None, lang_header=-1):
+                 title="submissions", tag_cols_for_header=None, header_lang=-1):
         """
 
         :param formpack: FormPack
@@ -44,13 +44,13 @@ def __init__(self, formpack, form_versions, lang=UNSPECIFIED_TRANSLATION,
         :param force_index: bool.
         :param title: string
         :param tag_cols_for_header: list
-        :param lang_header: string, False (`constants.UNSPECIFIED_TRANSLATION`), or
+        :param header_lang: string, False (`constants.UNSPECIFIED_TRANSLATION`), or
             None (`constants.UNTRANSLATED`), if not set, default value equal lang arg.
         """
 
         self.formpack = formpack
         self.lang = lang
-        self.lang_header = self.lang if lang_header == -1 else lang_header
+        self.header_lang = self.lang if header_lang == -1 else header_lang
         self.group_sep = group_sep
         self.title = title
         self.versions = form_versions
@@ -79,7 +79,7 @@ def __init__(self, formpack, form_versions, lang=UNSPECIFIED_TRANSLATION,
         # this deals with merging all form versions headers and labels
         params = (
             lang, group_sep, hierarchy_in_labels, multiple_select,
-            tag_cols_for_header, self.lang_header,
+            tag_cols_for_header, self.header_lang,
         )
         res = self.get_fields_labels_tags_for_all_versions(*params)
         self.sections, self.labels, self.tags = res
@@ -161,7 +161,7 @@ def get_fields_labels_tags_for_all_versions(self,
                                                 hierarchy_in_labels=False,
                                                 multiple_select="both",
                                                 tag_cols_for_header=None,
-                                                lang_header=UNSPECIFIED_TRANSLATION):
+                                                header_lang=UNSPECIFIED_TRANSLATION):
         """ Return 3 mappings containing field, labels, and tags by section
 
             This is needed because when making an export for several
@@ -203,7 +203,7 @@ def get_fields_labels_tags_for_all_versions(self,
         for field in all_fields:
             section_fields.setdefault(field.section.name, []).append(field)
             section_labels.setdefault(field.section.name, []).append(
-                field.get_labels(lang_header, group_sep,
+                field.get_labels(header_lang, group_sep,
                                  hierarchy_in_labels,
                                  multiple_select)
             )