Commit 2ddd5964 authored by bpresles's avatar bpresles
Browse files

feat(logo): Make G1Cards logo language dependent for instructions card

parent fabed668
......@@ -23,6 +23,7 @@ SECURITY="$9"
PASSWORD="${10}"
PRINT_INSTRUCTIONS="${11}"
PRINT_SECURITY="${12}"
LANG="${13}"
## PLANCHE DE CARTES
NBbillets=8
......@@ -111,7 +112,7 @@ do
mkdir -p "/tmp/fidelig1/${UNIQID}"
# CREATION FICHIER IMAGE BILLET
echo $(${MY_PATH}/MAKE_FIDELIG1.sh "${NUMBER}" "${SECRET}" "${PUBKEY}" "${PRIVKEY}" "${UNIQKEY}" "${UNIQID}" "${STYLE}" "${NAME}" "${COMPANY_NAME}" "${COMPANY_ADDRESS_1}" "${COMPANY_ADDRESS_2}" "${COMPANY_PHONE}" "${COMPANY_EMAIL}" "${SECURITY}" "${PRINT_INSTRUCTIONS}" "${PRINT_SECURITY}")
echo $(${MY_PATH}/MAKE_FIDELIG1.sh "${NUMBER}" "${SECRET}" "${PUBKEY}" "${PRIVKEY}" "${UNIQKEY}" "${UNIQID}" "${STYLE}" "${NAME}" "${COMPANY_NAME}" "${COMPANY_ADDRESS_1}" "${COMPANY_ADDRESS_2}" "${COMPANY_PHONE}" "${COMPANY_EMAIL}" "${SECURITY}" "${PRINT_INSTRUCTIONS}" "${PRINT_SECURITY}" "${LANG}")
done
......
......@@ -29,6 +29,7 @@ COMPANY_EMAIL="${13}"
SECURITY="${14}"
PRINT_INSTRUCTIONS="${15}"
PRINT_SECURITY="${16}"
LANG="${17}"
BGEXTENSION="jpg"
......@@ -232,7 +233,7 @@ then
convert -bordercolor black -border 1 \
"/tmp/fidelig1/${UNIQID}/${CARDNAME}.CARD.INSTRUCTIONS.jpg" "/tmp/fidelig1/${UNIQID}/${CARDNAME}.CARD.INSTRUCTIONS.jpg"
composite -compose Over -gravity NorthWest -geometry +20+50 -colorspace sRGB "${MY_PATH}/images/common/G1CardsSmall.png" "/tmp/fidelig1/${UNIQID}/${CARDNAME}.CARD.INSTRUCTIONS.jpg" "/tmp/fidelig1/${UNIQID}/${CARDNAME}.CARD.INSTRUCTIONS.jpg"
composite -compose Over -gravity NorthWest -geometry +20+50 -colorspace sRGB "${MY_PATH}/images/${LANG}/G1CardsSmall.png" "/tmp/fidelig1/${UNIQID}/${CARDNAME}.CARD.INSTRUCTIONS.jpg" "/tmp/fidelig1/${UNIQID}/${CARDNAME}.CARD.INSTRUCTIONS.jpg"
convert -font 'LiberationSans' \
-pointsize 20 -fill black -draw 'text 450,20 "'"$PUBKEY"'"' \
......
......@@ -36,7 +36,7 @@ $exec_string .= ' FIDELIG1_LINK_FORUM_MSG="'.$strings->label_link_forum.'"';
$exec_string .= ' FIDELIG1_LINK_GCHANGE_MSG="'.$strings->label_link_gchange.'"';
$exec_string .= ' FIDELIG1_LINK_CESIUM_MSG="'.$strings->label_link_cesium.'"';
$exec_string .= ' '.dirname(__FILE__).'/FIDELIG1.sh "'.$timestamp.'" "'.$data['style'].'" "'.$data['name'].'" "'.$data['company_name'].'" "'.$data['company_address1'].'" "'.$data['company_address2'].'" "'.$data['company_phone'].'" "'.$data['company_email'].'" "'.$data['security'].'" "'.$data['password'].'" "'.$data['instructions_card'].'" "'.$data['security_instructions'].'"';
$exec_string .= ' '.dirname(__FILE__).'/FIDELIG1.sh "'.$timestamp.'" "'.$data['style'].'" "'.$data['name'].'" "'.$data['company_name'].'" "'.$data['company_address1'].'" "'.$data['company_address2'].'" "'.$data['company_phone'].'" "'.$data['company_email'].'" "'.$data['security'].'" "'.$data['password'].'" "'.$data['instructions_card'].'" "'.$data['security_instructions'].'" "'.$lang.'"';
echo shell_exec($exec_string);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment