From 34e40c1d9dfef4ff50a2941b4af8e7ad08691814 Mon Sep 17 00:00:00 2001 From: Alexander Tsybulsky Date: Tue, 1 Aug 2023 08:16:53 +0300 Subject: [PATCH] Fix description handling (#6384) --- src/objects/texts/zcl_abapgit_sotr_handler.clas.abap | 3 ++- src/objects/zcl_abapgit_object_clas.clas.abap | 6 +++--- src/objects/zcl_abapgit_object_intf.clas.abap | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap b/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap index 942d9c609..16e3d8945 100644 --- a/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap +++ b/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap @@ -368,7 +368,8 @@ CLASS ZCL_ABAPGIT_SOTR_HANDLER IMPLEMENTATION. CHECK lv_sotr-entries IS NOT INITIAL. ENDIF. lt_language_filter = io_i18n_params->build_language_filter( ). - DELETE lv_sotr-entries WHERE NOT langu IN lt_language_filter. + DELETE lv_sotr-entries WHERE NOT langu IN lt_language_filter + AND langu <> io_i18n_params->ms_params-main_language. CHECK lv_sotr-entries IS NOT INITIAL. INSERT lv_sotr INTO TABLE et_sotr. diff --git a/src/objects/zcl_abapgit_object_clas.clas.abap b/src/objects/zcl_abapgit_object_clas.clas.abap index 2a79a10a8..04b62a717 100644 --- a/src/objects/zcl_abapgit_object_clas.clas.abap +++ b/src/objects/zcl_abapgit_object_clas.clas.abap @@ -135,7 +135,7 @@ ENDCLASS. -CLASS zcl_abapgit_object_clas IMPLEMENTATION. +CLASS ZCL_ABAPGIT_OBJECT_CLAS IMPLEMENTATION. METHOD constructor. @@ -472,7 +472,7 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. ENDIF. " Remove technical languages lt_language_filter = mo_i18n_params->build_language_filter( ). - DELETE lt_descriptions WHERE NOT langu IN lt_language_filter. + DELETE lt_descriptions WHERE NOT langu IN lt_language_filter AND langu <> mv_language. ii_xml->add( iv_name = 'DESCRIPTIONS' ig_data = lt_descriptions ). @@ -499,7 +499,7 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. ENDIF. " Remove technical languages lt_language_filter = mo_i18n_params->build_language_filter( ). - DELETE lt_descriptions WHERE NOT langu IN lt_language_filter. + DELETE lt_descriptions WHERE NOT langu IN lt_language_filter AND langu <> mv_language. ii_xml->add( iv_name = 'DESCRIPTIONS_SUB' ig_data = lt_descriptions ). diff --git a/src/objects/zcl_abapgit_object_intf.clas.abap b/src/objects/zcl_abapgit_object_intf.clas.abap index 11ca2b0d7..7a68d02c1 100644 --- a/src/objects/zcl_abapgit_object_intf.clas.abap +++ b/src/objects/zcl_abapgit_object_intf.clas.abap @@ -290,7 +290,7 @@ CLASS ZCL_ABAPGIT_OBJECT_INTF IMPLEMENTATION. " Remove technical languages lt_language_filter = mo_i18n_params->build_language_filter( ). - DELETE lt_descriptions WHERE NOT langu IN lt_language_filter. + DELETE lt_descriptions WHERE NOT langu IN lt_language_filter AND langu <> mv_language. IF lines( lt_descriptions ) = 0. RETURN. @@ -317,7 +317,7 @@ CLASS ZCL_ABAPGIT_OBJECT_INTF IMPLEMENTATION. " Remove technical languages lt_language_filter = mo_i18n_params->build_language_filter( ). - DELETE lt_descriptions WHERE NOT langu IN lt_language_filter. + DELETE lt_descriptions WHERE NOT langu IN lt_language_filter AND langu <> mv_language. IF lines( lt_descriptions ) = 0. RETURN.