Merge branch 'added-translations-for-wine' of github.com:Htylol/PortWINE into Htylol-added-translations-for-wine

This commit is contained in:
Mikhail Tergoev
2024-10-23 13:04:50 +03:00
5 changed files with 30 additions and 18 deletions

View File

@ -1065,9 +1065,9 @@ EOF
}
init_wine_ver () {
if [[ "${PW_WINE_VER}" == "USE_SYSTEM_WINE" ]]
if [[ "${PW_WINE_VER}" == "${translations[USE_SYSTEM_WINE]}" ]]
then export PW_WINE_USE="USE_SYSTEM_WINE"
elif [[ "${PW_WINE_VER}" == "GET-OTHER-WINE" ]]
elif [[ "${PW_WINE_VER}" == "${translations[GET-OTHER-WINE]}" ]]
then gui_proton_downloader
elif [[ -n "${PW_WINE_VER}" ]]
then export PW_WINE_USE="$PW_WINE_VER"

View File

@ -437,9 +437,6 @@ if [[ -d "${PORT_WINE_PATH}/data/prefixes/" ]] ; then
fi
unset DIST_ADD_TO_GUI
if command -v wine &>/dev/null
then DIST_ADD_TO_GUI="!USE_SYSTEM_WINE"
fi
if [[ -d "${PORT_WINE_PATH}/data/dist/" ]] ; then
for DAIG in "${PORT_WINE_PATH}"/data/dist/* ; do
if [[ "${DAIG//"${PORT_WINE_PATH}/data/dist/"/}" != "${PW_WINE_LG_VER}" ]] \
@ -450,6 +447,9 @@ if [[ -d "${PORT_WINE_PATH}/data/dist/" ]] ; then
fi
done
fi
if command -v wine &>/dev/null
then DIST_ADD_TO_GUI+="!${translations[USE_SYSTEM_WINE]}"
fi
SORT_OPENGL="${translations[WineD3D OpenGL (For video cards without Vulkan)]}"
SORT_VULKAN="${translations[WineD3D Vulkan (Damavand experimental)]}"
@ -471,14 +471,14 @@ esac
if [[ $PW_WINE_USE == PROTON_LG ]] ; then
PW_WINE_USE="${PW_PROTON_LG_VER}"
PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
PW_DEFAULT_WINE_USE="${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!${translations[GET-OTHER-WINE]}"
elif [[ $PW_WINE_USE == WINE_*_LG ]] \
|| [[ $PW_WINE_USE == WINE_LG ]]
then
PW_WINE_USE="${PW_WINE_LG_VER}"
PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}${DIST_ADD_TO_GUI}!${translations[GET-OTHER-WINE]}"
else
PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!GET-OTHER-WINE"
PW_DEFAULT_WINE_USE="${PW_PROTON_LG_VER}!${PW_WINE_LG_VER}${DIST_ADD_TO_GUI}!${translations[GET-OTHER-WINE]}"
fi
if [[ -z "${PORTWINE_DB_FILE}" ]] ; then