Skip to content

GitLab

Commit 0415fe72 authored by Leonardo Piccioni de Almeida's avatar Leonardo Piccioni de Almeida
Browse files

Improve address-related translations and customizations.

parent 0c3e6188
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1194 additions and 1081 deletions
conf/agent-types.php
View file @ 0415fe72
......@@ -178,39 +178,28 @@ return array(
],
'En_Estado' => [
'label' => \MapasCulturais\i::__('Estado'),
'private' => function(){
return !$this->publicLocation;
}
],
'En_Pais' => [
'label' => \MapasCulturais\i::__('País'),
'private' => function(){
return !$this->publicLocation;
},
'type' => 'select',
'options' => array(
'AC'=>'Acre',
'AL'=>'Alagoas',
'AP'=>'Amapá',
'AM'=>'Amazonas',
'BA'=>'Bahia',
'CE'=>'Ceará',
'DF'=>'Distrito Federal',
'ES'=>'Espírito Santo',
'GO'=>'Goiás',
'MA'=>'Maranhão',
'MT'=>'Mato Grosso',
'MS'=>'Mato Grosso do Sul',
'MG'=>'Minas Gerais',
'PA'=>'Pará',
'PB'=>'Paraíba',
'PR'=>'Paraná',
'PE'=>'Pernambuco',
'PI'=>'Piauí',
'RJ'=>'Rio de Janeiro',
'RN'=>'Rio Grande do Norte',
'RS'=>'Rio Grande do Sul',
'RO'=>'Rondônia',
'RR'=>'Roraima',
'SC'=>'Santa Catarina',
'SP'=>'São Paulo',
'SE'=>'Sergipe',
'TO'=>'Tocantins',
'AR'=>'Argentina',
'BR'=>'Brasil',
'CL'=>'Chile',
'CR'=>'Costa Rica',
'EC'=>'Ecuador',
'SV'=>'El Salvador',
'ES'=>'España',
'GT'=>'Guatemala',
'MX'=>'México',
'PE'=>'Perú',
'UY'=>'Uruguay',
)
],
......
docker-compose.yml
View file @ 0415fe72
......@@ -36,6 +36,12 @@ services:
- ./docker-data/public-files:/var/www/html/files
- ./docker-data/private-files:/var/www/private-files
- ./conf/agent-types.php:/var/www/html/protected/application/conf/agent-types.php
- ./conf/opportunity-types.php:/var/www/html/protected/application/conf/opportunity-types.php
- ./conf/taxonomies.php:/var/www/html/protected/application/conf/taxonomies.php
- ./translations/es_ES.mo:/var/www/html/protected/application/translations/es_ES.mo
- ./translations/es_ES.po:/var/www/html/protected/application/translations/es_ES.po
links:
- db
environment:
......
themes/IberCulturaViva/Theme.php
View file @ 0415fe72
......@@ -59,8 +59,6 @@ class Theme extends BaseV1\Theme{
$this->asset('img/home--projects.jpg', false);
$this->asset('img/home--spaces.jpg', false);
$this->enqueueScript('app', 'hide-fields', 'js/hide-fields.js');
$this->jsObject['assets']['logo-instituicao'] = $this->asset('img/logo-instituicao.png', false);
}
......
themes/IberCulturaViva/assets/css/sass/_hide-fields.scss deleted 100644 → 0
View file @ 0c3e6188
// Hide sexual orientation
.ficha-spcultura {
p.privado:nth-child(6) {
display: none;
}
}
// Hide CEP input
.infos {
p.endereco + p {
display: none;
}
}
\ No newline at end of file
themes/IberCulturaViva/assets/css/sass/main.scss
View file @ 0415fe72
......@@ -4,4 +4,3 @@
@import "mixins";
@import "../../../../BaseV1/assets/css/sass/main";
@import "overrides";
@import "hide-fields";
\ No newline at end of file
themes/IberCulturaViva/assets/js/customizable.js
View file @ 0415fe72
......@@ -19,8 +19,8 @@
*
*
*/
MapasCulturais.buildAddress = function(streetName, streetNumber, complement, neighborhood, city, state, postalCode) {
return streetName + ", " + streetNumber + (complement ? ", " + complement : "") + (neighborhood ? ", " + neighborhood : "") + ", " + city;
MapasCulturais.buildAddress = function(streetName, streetNumber, complement, neighborhood, city, state, country, postalCode) {
return streetName + ", " + streetNumber + (complement ? ", " + complement : "") + ", " + neighborhood + ", " + postalCode + ", " + city + ", " + state + ", " + country;
}
......
themes/IberCulturaViva/assets/js/editable.js
View file @ 0415fe72
......@@ -1122,8 +1122,9 @@ $(function(){
var bairro = $('#En_Bairro').editable('getValue', true);
var municipio = $('#En_Municipio').editable('getValue', true);
var estado = $('#En_Estado').editable('getValue', true);
if(nome_logradouro && numero && bairro && municipio){
var endereco = MapasCulturais.buildAddress(nome_logradouro, numero, complemento, bairro, municipio, estado, cep);
var pais = $('#En_Pais').editable('getValue', true);
if (nome_logradouro && numero && bairro && municipio && estado && pais){
var endereco = MapasCulturais.buildAddress(nome_logradouro, numero, complemento, bairro, municipio, estado, pais, cep);
$('#endereco').editable('setValue', endereco);
$('#endereco').trigger('changeAddress', endereco);
$('.js-endereco').html(endereco);
......@@ -1132,7 +1133,7 @@ $(function(){
};
$('#En_Nome_Logradouro, #En_CEP, #En_Num, #En_Complemento, #En_Bairro, #En_Municipio, #En_Estado').on('hidden', function(e, params) {
$('#En_Nome_Logradouro, #En_CEP, #En_Num, #En_Complemento, #En_Bairro, #En_Municipio, #En_Estado, #En_Pais').on('hidden', function(e, params) {
concatena_enderco();
});
......
themes/IberCulturaViva/assets/js/google-geocoder.js
View file @ 0415fe72
......@@ -9,6 +9,9 @@
* number: number,
* neighborhood: neighborhood,
* city: city,
* state: state,
* country: country,
* postalCode: cep
* }, geocode_callback);
*
*/
......@@ -27,11 +30,20 @@ MapasCulturais.geocoder = {
var address = false;
if (addressElements.fullAddress)
address = addressElements.fullAddress;
if (!address) {
address = addressElements.streetName + (addressElements.number ? ', ' + addressElements.number : '');
if (addressElements.city)
address += ', ' + addressElements.city;
if (addressElements.state)
address += ', ' + addressElements.state;
if (addressElements.country)
address += ', ' + addressElements.country;
}
this.geocoder.geocode({'address': address}, function(results, status) {
......
themes/IberCulturaViva/assets/js/hide-fields.js deleted 100644 → 0
View file @ 0c3e6188
// Hide Brazilian states
window.setTimeout(function() {
document.querySelectorAll('p').forEach(function(p) {
if (p.querySelectorAll('#En_Estado').length) {
p.style.display = 'none';
}
});
}, 1000);
themes/IberCulturaViva/layouts/parts/singles/location.php 0 → 100644
View file @ 0415fe72
<?php
$lat = $entity->location->latitude; $lng = $entity->location->longitude;
$has_private_location = isset($has_private_location) && $has_private_location
?>
<?php if ( $this->isEditable() || (($has_private_location && $entity->publicLocation && $lat && $lng) || (!$has_private_location && $lat && $lng)) ): ?>
<?php $this->applyTemplateHook('location','before'); ?>
<div class="servico clearfix">
<div class="mapa js-map-container">
<?php if($this->isEditable()): ?>
<div class="clearfix js-leaflet-control" data-leaflet-target=".leaflet-top.leaflet-left">
<a id ="button-locate-me" class="control-infobox-open hltip botoes-do-mapa" title="<?php \MapasCulturais\i::esc_attr_e("Encontrar minha localização");?>"></a>
</div>
<?php endif; ?>
<div id="single-map-container" class="js-map" data-lat="<?php echo $lat?>" data-lng="<?php echo $lng?>"></div>
<input type="hidden" id="map-target" data-name="location" class="js-editable" data-edit="location" data-value="<?php echo '[' . $lng . ',' . $lat . ']'; ?>"/>
</div>
<!--.mapa-->
<div class="infos">
<?php $this->applyTemplateHook('location-info','before'); ?>
<input type="hidden" class="js-editable" id="endereco" data-edit="endereco" data-original-title="<?php \MapasCulturais\i::esc_attr_e("Endereço");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o endereço");?>" data-showButtons="bottom" value="<?php echo $entity->endereco ?>" data-value="<?php echo $entity->endereco ?>">
<p class="endereco"><span class="label"><?php \MapasCulturais\i::_e("Endereço");?>:</span> <span class="js-endereco"><?php echo $entity->endereco ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("CEP");?>:</span> <span class="js-editable js-mask-cep" id="En_CEP" data-edit="En_CEP" data-original-title="<?php \MapasCulturais\i::esc_attr_e("CEP");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o CEP");?>" data-showButtons="bottom"><?php echo $entity->En_CEP ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("Logradouro");?>:</span> <span class="js-editable" id="En_Nome_Logradouro" data-edit="En_Nome_Logradouro" data-original-title="<?php \MapasCulturais\i::esc_attr_e("Logradouro");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o logradouro");?>" data-showButtons="bottom"><?php echo $entity->En_Nome_Logradouro ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("Número");?>:</span> <span class="js-editable" id="En_Num" data-edit="En_Num" data-original-title="<?php \MapasCulturais\i::esc_attr_e("Número");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o Número");?>" data-showButtons="bottom"><?php echo $entity->En_Num ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("Complemento");?>:</span> <span class="js-editable" id="En_Complemento" data-edit="En_Complemento" data-original-title="<?php \MapasCulturais\i::esc_attr_e("Complemento");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira um complemento");?>" data-showButtons="bottom"><?php echo $entity->En_Complemento ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("Bairro");?>:</span> <span class="js-editable" id="En_Bairro" data-edit="En_Bairro" data-original-title="<?php \MapasCulturais\i::esc_attr_e("Bairro");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o Bairro");?>" data-showButtons="bottom"><?php echo $entity->En_Bairro ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("Município");?>:</span> <span class="js-editable" id="En_Municipio" data-edit="En_Municipio" data-original-title="<?php \MapasCulturais\i::esc_attr_e("Município");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o Município");?>" data-showButtons="bottom"><?php echo $entity->En_Municipio ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("Estado");?>:</span> <span class="js-editable" id="En_Estado" data-edit="En_Estado" data-original-title="<?php \MapasCulturais\i::esc_attr_e("Estado");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o Estado");?>" data-showButtons="bottom"><?php echo $entity->En_Estado ?></span></p>
<p><span class="label"><?php \MapasCulturais\i::_e("País");?>:</span> <span class="js-editable" id="En_Pais" data-edit="En_Pais" data-original-title="<?php \MapasCulturais\i::esc_attr_e("País");?>" data-emptytext="<?php \MapasCulturais\i::esc_attr_e("Insira o País");?>" data-showButtons="bottom"><?php echo $entity->En_Pais ?></span></p>
<?php if($has_private_location && $this->isEditable()): ?>
<p class="privado">
<span class="icon icon-private-info"></span><span class="label"><?php \MapasCulturais\i::_e("Localização");?>:</span>
<span class="js-editable clear" data-edit="publicLocation" data-type="select" data-showbuttons="false"
data-value="<?php echo $entity->publicLocation ? '1' : '0';?>"
<?php /* Translators: Location public / private */ ?>
data-source="[{value: 1, text: '<?php \MapasCulturais\i::esc_attr_e("Pública");?>'},{value: 0, text:'<?php \MapasCulturais\i::esc_attr_e("Privada");?>'}]">
</span>
</p>
<?php endif; ?>
<?php $this->applyTemplateHook('location-info','after'); ?>
<?php $html = ''; $geoMeta = false; foreach($app->getRegisteredGeoDivisions() as $k => $geo_division): if (!$geo_division->display) continue; $metakey = $geo_division->metakey;?>
<?php
$html .= ($entity->$metakey) ? '<p>' : '<p style="display:none">';
$html .= '<span class="label">' . $geo_division->name . ':</span> <span class="js-geo-division-address" data-metakey="' . $metakey .'">' . $entity->$metakey . '</span></p>';
$geoMeta = ($entity->$metakey && !$geoMeta) ? true : $geoMeta;
?>
<?php endforeach;
if($geoMeta){ ?>
<div class="sobre-info-geo-bt hltip icon icon-arrow-up">
<a href="#"><?php \MapasCulturais\i::_e("Informações Geográficas");?></a>
</div>
<div class="sobre-info-geo" style="display:none;">
<?php echo $html; ?>
</div><!--.sobre-info-geo-->
<?php }
?>
</div>
<!--.infos-->
</div>
<!--.servico-->
<?php $this->applyTemplateHook('location','after'); ?>
<?php endif; ?>
translations/es_ES.mo
View file @ 0415fe72
No preview for this file type
translations/es_ES.po
View file @ 0415fe72
This diff is collapsed.
Markdown is supported
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