diff --git a/application/language/german/contesting_lang.php b/application/language/german/contesting_lang.php index 399d37139..9e4ad1b8d 100644 --- a/application/language/german/contesting_lang.php +++ b/application/language/german/contesting_lang.php @@ -28,7 +28,7 @@ $lang['contesting_title_callsign_suggestions'] = 'Rufzeichenvorschläge'; $lang['contesting_title_contest_logbook'] = 'Contest-Logbuch'; $lang['contesting_copy_exch_to_dok'] = 'Kopiere den erhaltenen Exchange in das DOK Feld der Datenbank!'; -$lang['contesting_copy_exch_notice'] = 'Exchange is only copied if it is matching rules for the selected field!'; +$lang['contesting_copy_exch_notice'] = 'Exchange wird nur kopiert, wenn der Wert Regeln für das Zielfeld erfüllt!'; $lang['contesting_copy_exch_to_none'] = 'Kopiere den erhaltenen Exchange in kein weiteres Feld der Datenbank!'; $lang['contesting_copy_exch_to_power'] = 'Kopiere den erhaltenen Exchange in das RX-Power Feld der Datenbank!'; $lang['contesting_copy_exch_to_state'] = 'Kopiere den erhaltenen Exchange in das US-State Feld der Datenbank!'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 5dc655cb3..589a1cdab 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -182,7 +182,7 @@ class Logbook_model extends CI_Model { $qso_age = intval($srx_string); break; case 'state': - if ( preg_match('/^[A-Z]{2}/', $srx_string) && $srx_string != "DX" ) { + if ( preg_match('/^[A-Za-z]*$/', $srx_string) && $srx_string != "DX" ) { $qso_state = $srx_string; } break; @@ -192,9 +192,9 @@ class Logbook_model extends CI_Model { // Example for more sophisticated exchanges and their split into the db: //case 'name/power': // if (strlen($srx_string) == 0) break; - // $exch_pt = explode(" ",$srx_string); + // $exch_pt = explode("/",$srx_string); // $qso_name = $exch_pt[0]; - // if (count($exch_pt)>1) $qso_power = $exch_pt[1]; + // if (count($exch_pt)>1) $qso_rx_power = intval($exch_pt[1]); // break; default: }