diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 74d6fe90..548ecafd 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -51,7 +51,7 @@ class Logbook extends CI_Controller { $data['results'] = $this->logbook_model->get_qsos($config['per_page'],$this->uri->segment(3)); if(!$data['results']) { - $this->session->set_flashdata('notice', $this->lang->line('error_no_logbook_found') . ' Station Logbooks'); + $this->session->set_flashdata('notice', lang('error_no_logbook_found') . ' Station Logbooks'); } // Calculate Lat/Lng from Locator to use on Maps @@ -540,16 +540,16 @@ class Logbook extends CI_Controller { } switch($this->session->userdata('user_previous_qsl_type')) { case 0: - $html .= "".$this->lang->line('gen_hamradio_qsl').""; + $html .= "".lang('gen_hamradio_qsl').""; break; case 1: - $html .= "".$this->lang->line('lotw_short').""; + $html .= "".lang('lotw_short').""; break; case 2: - $html .= "".$this->lang->line('eqsl_short').""; + $html .= "".lang('eqsl_short').""; break; default: - $html .= "".$this->lang->line('gen_hamradio_qsl').""; + $html .= "".lang('gen_hamradio_qsl').""; break; } $html .= ""; diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php index 6e7ad86f..e598594a 100644 --- a/application/views/dxatlas/index.php +++ b/application/views/dxatlas/index.php @@ -62,7 +62,7 @@ foreach($dxcc as $d){ echo ''; } diff --git a/application/views/kml/index.php b/application/views/kml/index.php index 82b04e92..4b9cdb85 100644 --- a/application/views/kml/index.php +++ b/application/views/kml/index.php @@ -35,7 +35,7 @@ foreach($dxcc as $d){ echo ''; } diff --git a/application/views/logbooks/edit.php b/application/views/logbooks/edit.php index 1df99f4f..81811052 100644 --- a/application/views/logbooks/edit.php +++ b/application/views/logbooks/edit.php @@ -95,7 +95,7 @@ @@ -129,7 +129,7 @@ foreach ($station_locations_linked->result() as $row) { ?> - station_profile_name;?> (Callsign: station_callsign;?> DXCC: station_country; if ($row->end != NULL) { echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; } ?>) + station_profile_name;?> (Callsign: station_callsign;?> DXCC: station_country; if ($row->end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>) adif . '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name), "- (/"); if ($d->Enddate != null) { - echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')'; + echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; } echo ''; } diff --git a/application/views/lotw_views/index.php b/application/views/lotw_views/index.php index 53bf670a..447a498d 100644 --- a/application/views/lotw_views/index.php +++ b/application/views/lotw_views/index.php @@ -44,7 +44,7 @@ result() as $row) { ?> callsign; ?> - cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; } ?> + cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?> qso_start_date)) { $valid_qso_start = strtotime( $row->qso_start_date ); diff --git a/application/views/notes/main.php b/application/views/notes/main.php index ccef4f53..ad4d2343 100644 --- a/application/views/notes/main.php +++ b/application/views/notes/main.php @@ -19,7 +19,7 @@ if ($notes->num_rows() > 0) { - echo "

".$this->lang->line('notes_your_notes')."

"; + echo "

".lang('notes_your_notes')."

"; echo ""; } else { - echo "

".$this->lang->line('notes_welcome')."

"; + echo "

".lang('notes_welcome')."

"; } ?> diff --git a/application/views/oqrs/qsolist.php b/application/views/oqrs/qsolist.php index efeb6c39..393a8fd6 100644 --- a/application/views/oqrs/qsolist.php +++ b/application/views/oqrs/qsolist.php @@ -3,12 +3,12 @@ if ($qsos->result() != NULL) { echo ' - - - - - - + + + + + + '; if ($this->session->userdata('user_eqsl_name') != "") { echo ''; @@ -47,16 +47,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -66,16 +66,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_SENT_VIA != "") { switch ($qsl->COL_QSL_SENT_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": - echo " (".$this->lang->line('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; + echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } @@ -89,16 +89,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -108,16 +108,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_RCVD_VIA != "") { switch ($qsl->COL_QSL_RCVD_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": echo " (Manager)"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } @@ -127,7 +127,7 @@ if ($qsos->result() != NULL) { echo '
'.$this->lang->line('gen_hamradio_callsign').'' . $this->lang->line('general_word_date') . ''. $this->lang->line('general_word_time') .'' . $this->lang->line('gen_hamradio_mode') . '' . $this->lang->line('gen_hamradio_band') . '' . $this->lang->line('gen_hamradio_station') . ''.lang('gen_hamradio_callsign').'' . lang('general_word_date') . ''. lang('general_word_time') .'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_station') . ' QSLeQSL'; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent'); + echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($qsl->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -140,7 +140,7 @@ if ($qsos->result() != NULL) { echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received'); + echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($qsl->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -156,7 +156,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent'); + echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($qsl->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -169,7 +169,7 @@ if ($qsos->result() != NULL) { echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received'); + echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($qsl->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); diff --git a/application/views/qslcard/index.php b/application/views/qslcard/index.php index 4f8a7a91..3d71c88d 100644 --- a/application/views/qslcard/index.php +++ b/application/views/qslcard/index.php @@ -22,12 +22,12 @@ echo ' - - - - - - + + + + + + diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index 2548db87..f543733b 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -16,13 +16,13 @@ if ($qsos->result() != NULL) { echo '
'.$this->lang->line('gen_hamradio_callsign').''.$this->lang->line('gen_hamradio_mode').''.$this->lang->line('general_word_date').''.$this->lang->line('general_word_time').''.$this->lang->line('gen_hamradio_band').''.$this->lang->line('gen_hamradio_qsl').''.lang('gen_hamradio_callsign').''.lang('gen_hamradio_mode').''.lang('general_word_date').''.lang('general_word_time').''.lang('gen_hamradio_band').''.lang('gen_hamradio_qsl').'
- - - - - - - + + + + + + + diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php index 0809a8c8..8d6e8109 100644 --- a/application/views/qslprint/qsolist.php +++ b/application/views/qslprint/qsolist.php @@ -3,12 +3,12 @@ if ($qsos->result() != NULL) { echo '
'.$this->lang->line('gen_hamradio_callsign').'' . $this->lang->line('general_word_date') . ''. $this->lang->line('general_word_time') .'' . $this->lang->line('gen_hamradio_mode') . '' . $this->lang->line('gen_hamradio_band') . '' . $this->lang->line('gen_hamradio_qsl') . ' ' . $this->lang->line('general_word_qslcard_via') . '' . $this->lang->line('gen_hamradio_station') . ''.lang('gen_hamradio_callsign').'' . lang('general_word_date') . ''. lang('general_word_time') .'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_qsl') . ' ' . lang('general_word_qslcard_via') . '' . lang('gen_hamradio_station') . ' Sent method Delete QSO List
- - - - - - + + + + + + '; if ($this->session->userdata('user_eqsl_name') != "") { echo ''; @@ -47,16 +47,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -66,16 +66,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_SENT_VIA != "") { switch ($qsl->COL_QSL_SENT_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": - echo " (".$this->lang->line('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; + echo " (".lang('general_word_qslcard_via').": ".($qsl->COL_QSL_VIA!="" ? $qsl->COL_QSL_VIA:"n/a").")"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } @@ -89,16 +89,16 @@ if ($qsos->result() != NULL) { } switch ($qsl->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -108,16 +108,16 @@ if ($qsos->result() != NULL) { if ($qsl->COL_QSL_RCVD_VIA != "") { switch ($qsl->COL_QSL_RCVD_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": echo " (Manager)"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } @@ -127,7 +127,7 @@ if ($qsos->result() != NULL) { echo 'session->userdata('user_column1')=='Frequency' || $this->session->userdata('user_column2')=='Frequency' || $this->session->userdata('user_column3')=='Frequency' || $this->session->userdata('user_column4')=='Frequency' || $this->session->userdata('user_column5')=='Frequency') { - echo ''; + echo ''; } else { - echo ''; + echo ''; } ?> diff --git a/application/views/search/cqzones_result.php b/application/views/search/cqzones_result.php index 0ffe3f47..8ddad4d3 100644 --- a/application/views/search/cqzones_result.php +++ b/application/views/search/cqzones_result.php @@ -6,14 +6,14 @@ if ($qsos->result() != NULL) { - - - - + + + + - + '; diff --git a/application/views/search/duplicates_result.php b/application/views/search/duplicates_result.php index 65c1f9ff..97f6a46e 100644 --- a/application/views/search/duplicates_result.php +++ b/application/views/search/duplicates_result.php @@ -5,14 +5,14 @@ if ($qsos->result() != NULL) { - + - - - + + + '; diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index f37efe1a..60a25ddd 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -217,16 +217,16 @@ $ci =& get_instance(); } switch ($row->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent').$timestamp; + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -236,16 +236,16 @@ $ci =& get_instance(); if ($row->COL_QSL_SENT_VIA != "") { switch ($row->COL_QSL_SENT_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": - echo " (".$this->lang->line('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")"; + echo " (".lang('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } @@ -259,16 +259,16 @@ $ci =& get_instance(); } switch ($row->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received').$timestamp; + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received').$timestamp; break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued').$timestamp; break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested').$timestamp; + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested').$timestamp; break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore').$timestamp; + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore').$timestamp; break; default: echo "class=\"qsl-red"; @@ -278,16 +278,16 @@ $ci =& get_instance(); if ($row->COL_QSL_RCVD_VIA != "") { switch ($row->COL_QSL_RCVD_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": echo " (Manager)"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } @@ -297,7 +297,7 @@ $ci =& get_instance(); echo ' - + - + diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 8c1bf1d6..258d71b2 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -22,11 +22,11 @@ echo 'hidden '; } echo 'class="qslcardtab nav-item"> - '. $this->lang->line('general_word_qslcard') .' + '. lang('general_word_qslcard') .''; echo '
  • - '. $this->lang->line('general_word_qslcard_management') .' + '. lang('general_word_qslcard_management') .'
    • '; } @@ -190,7 +190,7 @@ name != null) { ?> - + @@ -423,7 +423,7 @@ station_country) { ?> - +
    '.$this->lang->line('gen_hamradio_callsign').'' . $this->lang->line('general_word_date') . ''. $this->lang->line('general_word_time') .'' . $this->lang->line('gen_hamradio_mode') . '' . $this->lang->line('gen_hamradio_band') . '' . $this->lang->line('gen_hamradio_station') . ''.lang('gen_hamradio_callsign').'' . lang('general_word_date') . ''. lang('general_word_time') .'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_station') . ' QSLeQSL'; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent'); + echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($qsl->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -140,7 +140,7 @@ if ($qsos->result() != NULL) { echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received'); + echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($qsl->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -156,7 +156,7 @@ if ($qsos->result() != NULL) { echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent'); + echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($qsl->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -169,7 +169,7 @@ if ($qsos->result() != NULL) { echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received'); + echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($qsl->COL_LOTW_QSLRDATE) { $timestamp = strtotime($qsl->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index f70e2014..618eade8 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -229,7 +229,7 @@ } echo '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); if ($d->Enddate != null) { - echo ' ('.$this->lang->line('gen_hamradio_deleted_dxcc').')'; + echo ' ('.lang('gen_hamradio_deleted_dxcc').')'; } echo ''; } diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 930dabfc..07918274 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -221,7 +221,7 @@ foreach($dxcc as $d){ echo ''; } @@ -549,9 +549,9 @@ '.$this->lang->line('gen_hamradio_frequency').''.lang('gen_hamradio_frequency').''.$this->lang->line('gen_hamradio_band').''.lang('gen_hamradio_band').'
    Date Time'.$this->lang->line('gen_hamradio_callsign').'' . $this->lang->line('gen_hamradio_mode') . '' . $this->lang->line('gen_hamradio_band') . '' . $this->lang->line('gen_hamradio_gridsquare') . ''.lang('gen_hamradio_callsign').'' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_gridsquare') . ' CQ Zone DXCC CQ Zone DXCC' . $this->lang->line('gen_hamradio_station') . '' . lang('gen_hamradio_station') . '
    Occurrence'.$this->lang->line('gen_hamradio_callsign').''.lang('gen_hamradio_callsign').' Min date Min time Max date Max time' . $this->lang->line('gen_hamradio_mode') . '' . $this->lang->line('gen_hamradio_band') . '' . $this->lang->line('gen_hamradio_station') . '' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_station') . '
    '; echo 'COL_EQSL_QSL_SENT == "Y") { - echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent'); + echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -310,7 +310,7 @@ $ci =& get_instance(); echo 'COL_EQSL_QSL_RCVD == "Y") { - echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received'); + echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -335,7 +335,7 @@ $ci =& get_instance(); echo ''; echo 'COL_LOTW_QSL_SENT == "Y") { - echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent'); + echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); @@ -348,7 +348,7 @@ $ci =& get_instance(); echo 'COL_LOTW_QSL_RCVD == "Y") { - echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received'); + echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index a50cab54..2548b1a9 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -52,7 +52,7 @@ diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index f99971ee..67952c68 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -71,7 +71,7 @@ diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php index fcf7f3b6..99fa96b7 100644 --- a/application/views/station_profile/index.php +++ b/application/views/station_profile/index.php @@ -59,7 +59,7 @@ station_profile_name;?>
    		 station_callsign;?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; } ?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?> station_gridsquare;?> station_active != 1) { ?> diff --git a/application/views/stations/index.php b/application/views/stations/index.php index aa881178..6cdbdcab 100644 --- a/application/views/stations/index.php +++ b/application/views/stations/index.php @@ -59,7 +59,7 @@ station_profile_name;?>
    		 station_callsign;?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; } ?>station_country == '' ? '- NONE -' : $row->station_country; if ($row->dxcc_end != NULL) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?> station_gridsquare;?> station_active != 1) { ?> diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php index 6e9cf2c1..0a017b6a 100644 --- a/application/views/timeplotter/index.php +++ b/application/views/timeplotter/index.php @@ -23,7 +23,7 @@ foreach ($dxcc_list->result() as $dxcc) { echo ''; } diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 6149f529..944fccdf 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -113,16 +113,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { COL_QSL_SENT != "N") { switch ($row->COL_QSL_SENT) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_sent'); + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_sent'); break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued'); + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued'); break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested'); + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested'); break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore'); + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore'); break; default: echo "class=\"qsl-red"; @@ -135,32 +135,32 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { if ($row->COL_QSL_SENT_VIA != "") { switch ($row->COL_QSL_SENT_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": - echo " (".$this->lang->line('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")"; + echo " (".lang('general_word_qslcard_via').": ".($row->COL_QSL_VIA!="" ? $row->COL_QSL_VIA:"n/a").")"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } ?>">▲ COL_QSL_RCVD != "N") { switch ($row->COL_QSL_RCVD) { case "Y": - echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_received'); + echo "class=\"qsl-green\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_received'); break; case "Q": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_queued'); + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_queued'); break; case "R": - echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_requested'); + echo "class=\"qsl-yellow\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_requested'); break; case "I": - echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".$this->lang->line('general_word_invalid_ignore'); + echo "class=\"qsl-grey\" data-toggle=\"tooltip\" data-original-title=\"".lang('general_word_invalid_ignore'); break; default: echo "class=\"qsl-red"; @@ -173,16 +173,16 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { if ($row->COL_QSL_RCVD_VIA != "") { switch ($row->COL_QSL_RCVD_VIA) { case "B": - echo " (".$this->lang->line('general_word_qslcard_bureau').")"; + echo " (".lang('general_word_qslcard_bureau').")"; break; case "D": - echo " (".$this->lang->line('general_word_qslcard_direct').")"; + echo " (".lang('general_word_qslcard_direct').")"; break; case "M": echo " (Manager)"; break; case "E": - echo " (".$this->lang->line('general_word_qslcard_electronic').")"; + echo " (".lang('general_word_qslcard_electronic').")"; break; } } ?>">▼ @@ -190,8 +190,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { session->userdata('user_eqsl_name') != ""){ ?> - COL_EQSL_QSL_SENT == "Y") { echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_sent'); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲ - COL_EQSL_QSL_RCVD == "Y") { echo "data-original-title=\"".$this->lang->line('eqsl_short')." ".$this->lang->line('general_word_received'); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> + COL_EQSL_QSL_SENT == "Y") { echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_sent'); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲ + COL_EQSL_QSL_RCVD == "Y") { echo "data-original-title=\"".lang('eqsl_short')." ".lang('general_word_received'); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> COL_EQSL_QSL_RCVD =='Y') { ?> COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼ @@ -203,8 +203,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { session->userdata('user_lotw_name') != "") { ?> - COL_LOTW_QSL_SENT == "Y") { echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_sent'); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">▲ - COL_LOTW_QSL_RCVD == "Y") { echo "data-original-title=\"".$this->lang->line('lotw_short')." ".$this->lang->line('general_word_received'); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">▼ + COL_LOTW_QSL_SENT == "Y") { echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_sent'); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">▲ + COL_LOTW_QSL_RCVD == "Y") { echo "data-original-title=\"".lang('lotw_short')." ".lang('general_word_received'); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">▼
    name)), "- (/"); if ($row->end != null) { echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; } ?>name)), "- (/"); if ($row->end != null) { echo ' '.lang('gen_hamradio_deleted_dxcc').''; } ?>
    Station Countrystation_country)), "- (/"); if ($row->station_end != null) echo ' '.$this->lang->line('gen_hamradio_deleted_dxcc').''; ?>station_country)), "- (/"); if ($row->station_end != null) echo ' '.lang('gen_hamradio_deleted_dxcc').''; ?>