SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 20:03:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Terminology: Inclusive Language - Part 5 (#4702)

Browse Source 
* Terminology: Inclusive Language - Part 5

Change of terminology (#4043)

- Replace `get_master_language` with `get_main_language` and remove it

* File Status

* Jump

* Language

* Main language

* Main language
This commit is contained in:
Marc Bernard 2021-04-15 08:32:09 +02:00 committed by GitHub
parent 4c6d407156
commit f18a8ee82b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/objects/core/zcl_abapgit_serialize.clas.abap
View File

@ -221,7 +221,7 @@ CLASS zcl_abapgit_serialize IMPLEMENTATION.
lt_found = serialize(
it_tadir = lt_tadir
iv_language = io_dot_abapgit->get_master_language( )
iv_language = io_dot_abapgit->get_main_language( )
ii_log = ii_log
iv_force_sequential = lv_force ).
APPEND LINES OF lt_found TO ct_files.

4
src/objects/zcl_abapgit_objects.clas.abap
View File

@ -579,7 +579,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION.
lt_items = map_results_to_items( lt_results ).
check_objects_locked( iv_language = io_repo->get_dot_abapgit( )->get_master_language( )
check_objects_locked( iv_language = io_repo->get_dot_abapgit( )->get_main_language( )
it_items = lt_items ).
lo_folder_logic = zcl_abapgit_folder_logic=>get_instance( ).
@ -619,7 +619,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION.
lo_xml = lo_files->read_xml( ).
li_obj = create_object( is_item = ls_item
iv_language = io_repo->get_dot_abapgit( )->get_master_language( )
iv_language = io_repo->get_dot_abapgit( )->get_main_language( )
is_metadata = lo_xml->get_metadata( ) ).
compare_remote_to_local(

11
src/repo/zcl_abapgit_dot_abapgit.clas.abap
View File

@ -56,9 +56,6 @@ CLASS zcl_abapgit_dot_abapgit DEFINITION
METHODS set_starting_folder
IMPORTING
!iv_path TYPE string .
METHODS get_master_language
RETURNING
VALUE(rv_language) TYPE spras .
METHODS get_main_language
RETURNING
VALUE(rv_language) TYPE spras .
@ -101,7 +98,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_DOT_ABAPGIT IMPLEMENTATION.
CLASS zcl_abapgit_dot_abapgit IMPLEMENTATION.
METHOD add_ignore.
@ -201,12 +198,6 @@ CLASS ZCL_ABAPGIT_DOT_ABAPGIT IMPLEMENTATION.
ENDMETHOD.
METHOD get_master_language.
" todo, transition to get_main_language()
rv_language = ms_data-master_language.
ENDMETHOD.
METHOD get_requirements.
rt_requirements = ms_data-requirements.
ENDMETHOD.

8
src/repo/zcl_abapgit_repo.clas.abap
View File

@ -250,16 +250,16 @@ CLASS zcl_abapgit_repo IMPLEMENTATION.
METHOD check_language.
DATA lv_master_language TYPE spras.
DATA lv_main_language TYPE spras.
" assumes find_remote_dot_abapgit has been called before
lv_master_language = get_dot_abapgit( )->get_master_language( ).
lv_main_language = get_dot_abapgit( )->get_main_language( ).
IF lv_master_language <> sy-langu.
IF lv_main_language <> sy-langu.
zcx_abapgit_exception=>raise( |Current login language |
&& |'{ zcl_abapgit_convert=>conversion_exit_isola_output( sy-langu ) }'|
&& | does not match main language |
&& |'{ zcl_abapgit_convert=>conversion_exit_isola_output( lv_master_language ) }'.|
&& |'{ zcl_abapgit_convert=>conversion_exit_isola_output( lv_main_language ) }'.|
&& | Select 'Advanced' > 'Open in Main Language'| ).
ENDIF.

4
src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
View File

@ -701,7 +701,7 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
METHOD is_repo_lang_logon_lang.
rv_repo_lang_is_logon_lang = boolc( mo_repo->get_dot_abapgit( )->get_master_language( ) = sy-langu ).
rv_repo_lang_is_logon_lang = boolc( mo_repo->get_dot_abapgit( )->get_main_language( ) = sy-langu ).
ENDMETHOD.
@ -718,7 +718,7 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
" https://blogs.sap.com/2017/01/13/logon-language-sy-langu-and-rfc/
lv_main_language = mo_repo->get_dot_abapgit( )->get_master_language( ).
lv_main_language = mo_repo->get_dot_abapgit( )->get_main_language( ).
lv_tcode = get_abapgit_tcode( ).
ASSERT lv_tcode IS NOT INITIAL.

8
src/ui/zcl_abapgit_gui_page_sett_repo.clas.abap
View File

@ -72,7 +72,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_REPO IMPLEMENTATION.
CLASS zcl_abapgit_gui_page_sett_repo IMPLEMENTATION.
METHOD constructor.
@ -174,6 +174,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_REPO IMPLEMENTATION.
DATA:
lo_dot TYPE REF TO zcl_abapgit_dot_abapgit,
ls_dot TYPE zif_abapgit_dot_abapgit=>ty_dot_abapgit,
lv_main_lang TYPE spras,
lv_language TYPE t002t-sptxt,
lv_ignore TYPE string,
ls_requirements LIKE LINE OF ls_dot-requirements,
@ -186,17 +187,18 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_REPO IMPLEMENTATION.
" Get settings from DB
lo_dot = mo_repo->get_dot_abapgit( ).
ls_dot = lo_dot->get_data( ).
lv_main_lang = lo_dot->get_main_language( ).
" Repository Settings
SELECT SINGLE sptxt INTO lv_language FROM t002t
WHERE spras = sy-langu AND sprsl = ls_dot-master_language.
WHERE spras = sy-langu AND sprsl = lv_main_lang.
IF sy-subrc <> 0.
lv_language = 'Unknown language; Check your .abapgit.xml file'.
ENDIF.
mo_form_data->set(
iv_key = c_id-main_language
iv_val = |{ ls_dot-master_language } ({ lv_language })| ).
iv_val = |{ lv_main_lang } ({ lv_language })| ).
mo_form_data->set(
iv_key = c_id-i18n_langs
iv_val = zcl_abapgit_lxe_texts=>convert_table_to_lang_string( lo_dot->get_i18n_languages( ) ) ).

8
src/ui/zcl_abapgit_gui_page_stage.clas.abap
View File

@ -622,15 +622,15 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_STAGE IMPLEMENTATION.
METHOD render_main_language_warning.
DATA: ls_dot_abapgit TYPE zif_abapgit_dot_abapgit=>ty_dot_abapgit.
DATA lv_main_language TYPE spras.
CREATE OBJECT ri_html TYPE zcl_abapgit_html.
ls_dot_abapgit = mo_repo->get_dot_abapgit( )->get_data( ).
lv_main_language = mo_repo->get_dot_abapgit( )->get_main_language( ).
IF ls_dot_abapgit-master_language <> sy-langu.
IF lv_main_language <> sy-langu.
ri_html->add( zcl_abapgit_gui_chunk_lib=>render_warning_banner(
|Caution: Main language of the repo is '{ ls_dot_abapgit-master_language }', |
|Caution: Main language of the repo is '{ lv_main_language }', |
&& |but you're logged on in '{ sy-langu }'| ) ).
ENDIF.