may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/1ka/1ka into master

Browse Source
This commit is contained in:
patrik2020 2020-08-24 19:49:32 +02:00
commit 30b4234668
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/classes/class.SurveyGeoIP.php
View File

@ -40,9 +40,15 @@ class SurveyGeoIP{
// Zakesiramo podatke o lokacijah
$this->calculateLocations();
//var_dump($this->data);
// Opozorilo o nenatancnosti
echo '<p class="bold">'.$lang['srv_geoip_warning'].'</p>';
echo '<div>';
echo '<div class="floatLeft">';
echo '<div class="floatLeft">';
// Izpis tabele frekvenc
echo '<table class="geoip_table">';

2
frontend/payments/classes/class.UserNarocila.php
View File

@ -171,7 +171,7 @@ class UserNarocila{
$rowNarocilo = mysqli_fetch_array($sqlNarocilo);
if($rowNarocilo['podjetje_drzava'] != 'Slovenija' && $rowNarocilo['podjetje_zavezanec'] == '1'){
if($rowNarocilo['podjetje_drzava'] != 'Slovenija' && $rowNarocilo['podjetje_drzava'] != 'Slovenia' && $rowNarocilo['podjetje_zavezanec'] == '1'){
return true;
}
}

1
lang/1.php
View File

@ -6318,6 +6318,7 @@ $lang = array (
'srv_geoip_unknown' => 'Neznano',
'srv_geoip_map_cities' => 'Vsa mesta',
'srv_geoip_map_countries' => 'Vse države',
'srv_geoip_warning' => 'Prosimo, upoštevajte, da so navedene IP lokacije lahko v določenih primerih nenatančne in zgolj ocene. Ocenjene so na podlagi knjižnice IP lokacij (verzija 2019), zato lahko pride do odstopanj od realnih podatkov.',
'srv_edits_analysis' => 'Analize urejanja',
'srv_edits_analysis_seansa' => 'Kriterij seanse: ',
'srv_edits_analysis_seansa_1h' => '1 ura',

3
lang/2.php
View File

@ -6200,7 +6200,8 @@ $lang = array (
'srv_geoip_freq' => 'Frequency',
'srv_geoip_unknown' => 'Unknown',
'srv_geoip_map_cities' => 'All cities',
'srv_geoip_map_countries' => 'All countries',
'srv_geoip_map_countries' => 'All countries',
'srv_geoip_warning' => 'Please note that the listed IP locations may in certain cases be inaccurate and are only estimates. They are estimated based on the library of IP locations (version 2019), so there may be deviations from the real data.',
'srv_edits_analysis' => 'Edits analysis',
'srv_edits_analysis_seansa' => 'Session criteria: ',
'srv_edits_analysis_seansa_1h' => '1 hour',