Merge branch 'detached' into 'master'

FIX call detail i18n See merge request documentale/cool-jconon!41
consiglionazionaledellericerche · Oct 12, 2023 · c8166be · c8166be
2 parents f64267d + be4e6aa
commit c8166be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cool-jconon-webapp-resources/src/main/resources/pages/call/call-detail.get.html.ftl b/cool-jconon-webapp-resources/src/main/resources/pages/call/call-detail.get.html.ftl
@@ -11,13 +11,13 @@
             </#if>
             <div class="well">
                 <h4 class="text-info">${message('label.jconon_call_descrizione')}</h4>
-                <span>${call['jconon_call:descrizione']}</span>
+                <span><#if locale_suffix != 'it' && call['jconon_call:descrizione_en']??>${call['jconon_call:descrizione_en']}<#else>${call['jconon_call:descrizione']}</#if></span>
                 <#if call['jconon_call:numero_posti']??>
                     <h4 class="text-info">${message('label.jconon_call_numero_posti')}</h4>
                     <span>${call['jconon_call:numero_posti']}</span>
                 </#if>
                 <h4 class="text-info">${message('label.jconon_call_requisiti')}</h4>
-                <span>${call['jconon_call:requisiti']}</span>
+                <span><#if locale_suffix != 'it' && call['jconon_call:requisiti_en']??>${call['jconon_call:requisiti_en']}<#else>${call['jconon_call:requisiti']}</#if></span>
             </div>
             <div class="well">
                 <#if call['jconon_call:profilo']??>

diff --git a/cool-jconon-webapp-resources/src/main/resources/pages/call/call_en.properties b/cool-jconon-webapp-resources/src/main/resources/pages/call/call_en.properties
@@ -26,7 +26,7 @@ type.F_jconon_call_folder=Call
 
 label.jconon_call_codice=Call Number
 label.jconon_call_numero_posti=Position available
-label.jconon_call_descrizione=Description (Italian)
+label.jconon_call_descrizione=Description
 label.jconon_call_descrizione_en=Description
 label.jconon_call_sede=Office (Italian)
 label.jconon_call_sede_en=Office