From a120ce66b0343d84f7a48bdc7d9f5969572b1125 Mon Sep 17 00:00:00 2001
From: Albert Mink <albert.mink@sap.com>
Date: Tue, 23 Jul 2024 12:36:06 +0200
Subject: [PATCH] Fix sap2/sap1 for AFF experimental (#6993)

Co-authored-by: abaplint[bot] <24845621+abaplint[bot]@users.noreply.github.com>
---
 .../zcl_abapgit_properties_file.clas.abap     |  2 +-
 ...pgit_properties_file.clas.testclasses.abap | 26 +++++++++++++++++++
 .../zcl_abapgit_properties_file.clas.xml      |  1 +
 ...l_abapgit_object_intf.clas.locals_imp.abap |  7 +++--
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 src/objects/texts/zcl_abapgit_properties_file.clas.testclasses.abap

diff --git a/src/objects/texts/zcl_abapgit_properties_file.clas.abap b/src/objects/texts/zcl_abapgit_properties_file.clas.abap
index a8d5f30e4..53827fb2c 100644
--- a/src/objects/texts/zcl_abapgit_properties_file.clas.abap
+++ b/src/objects/texts/zcl_abapgit_properties_file.clas.abap
@@ -42,7 +42,7 @@ CLASS zcl_abapgit_properties_file IMPLEMENTATION.
 
 
   METHOD constructor.
-    mv_lang = to_lower( iv_lang ).
+    mv_lang = to_upper( iv_lang ).
   ENDMETHOD.
 
 
diff --git a/src/objects/texts/zcl_abapgit_properties_file.clas.testclasses.abap b/src/objects/texts/zcl_abapgit_properties_file.clas.testclasses.abap
new file mode 100644
index 000000000..c18ccd38b
--- /dev/null
+++ b/src/objects/texts/zcl_abapgit_properties_file.clas.testclasses.abap
@@ -0,0 +1,26 @@
+CLASS ltcl_test DEFINITION FINAL FOR TESTING.
+
+  PUBLIC SECTION.
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+    METHODS assert_lang FOR TESTING RAISING cx_static_check.
+
+ENDCLASS.
+
+CLASS ltcl_test IMPLEMENTATION.
+
+  METHOD assert_lang.
+
+    DATA: lo_cut TYPE REF TO zcl_abapgit_properties_file.
+    DATA: lv_act TYPE laiso.
+    CREATE OBJECT lo_cut
+      EXPORTING
+        iv_lang = 'DE'.
+    lv_act = lo_cut->zif_abapgit_i18n_file~lang( ).
+
+    cl_abap_unit_assert=>assert_equals(
+      exp = 'DE'
+      act = lv_act ).
+  ENDMETHOD.
+
+ENDCLASS.
diff --git a/src/objects/texts/zcl_abapgit_properties_file.clas.xml b/src/objects/texts/zcl_abapgit_properties_file.clas.xml
index 8e7cdab77..1a3e72c48 100644
--- a/src/objects/texts/zcl_abapgit_properties_file.clas.xml
+++ b/src/objects/texts/zcl_abapgit_properties_file.clas.xml
@@ -10,6 +10,7 @@
     <CLSCCINCL>X</CLSCCINCL>
     <FIXPT>X</FIXPT>
     <UNICODE>X</UNICODE>
+    <WITH_UNIT_TESTS>X</WITH_UNIT_TESTS>
    </VSEOCLASS>
   </asx:values>
  </asx:abap>
diff --git a/src/objects/zcl_abapgit_object_intf.clas.locals_imp.abap b/src/objects/zcl_abapgit_object_intf.clas.locals_imp.abap
index 8e2361fec..c75f97dcb 100644
--- a/src/objects/zcl_abapgit_object_intf.clas.locals_imp.abap
+++ b/src/objects/zcl_abapgit_object_intf.clas.locals_imp.abap
@@ -706,7 +706,8 @@ CLASS lcl_aff_metadata_handler IMPLEMENTATION.
           li_translation_file LIKE LINE OF lt_translation_file,
           ls_aff_data         TYPE zif_abapgit_aff_intf_v1=>ty_main,
           lo_type_mapper      TYPE REF TO zif_abapgit_aff_type_mapping,
-          ls_ag_data          TYPE zcl_abapgit_object_intf=>ty_intf.
+          ls_ag_data          TYPE zcl_abapgit_object_intf=>ty_intf,
+          lv_sap1             TYPE syst_langu.
 
     lt_translation_file = io_files->read_i18n_files( ).
 
@@ -717,7 +718,9 @@ CLASS lcl_aff_metadata_handler IMPLEMENTATION.
       lo_properties_file ?= li_translation_file.
       lo_properties_file->get_translations( IMPORTING ev_data = ls_aff_data ).
 
-      ls_aff_data-header-original_language = to_upper( li_translation_file->lang( ) ). " is target language
+      lv_sap1 = zcl_abapgit_convert=>language_sap2_to_sap1( li_translation_file->lang( ) ).
+      ls_aff_data-header-original_language = lv_sap1.
+
 
       CREATE OBJECT lo_type_mapper TYPE lcl_aff_type_mapping.
       lo_type_mapper->to_abapgit(