diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index ba007288f..dd4aa9789 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index 69da2de42..f38c1a20a 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -94,7 +94,7 @@ $lang['qso_simplefle_syntax_help_ln3'] = "例如，如果您在 20m 上与 DF3CB $lang['qso_simplefle_syntax_help_ln4'] = "如果您不提供任何 RST 信息，语法将使用 59 (599 用于数据)。我们的下一个 QSO 不是双方都是 59，所以我们首先提供发送的 RST 信息。它比第一个 QSO 晚了 2 分钟。"; $lang['qso_simplefle_syntax_help_ln5'] = "第一个 QSO 是在 21:34，第二个 QSO 在 21:36，比第一个 QSO 晚了 2 分钟。我们写下 6，因为这是这里唯一改变的数据。关于波段和模式的信息没有改变，因此省略了这些数据。"; $lang['qso_simplefle_syntax_help_ln6'] = "我们的下一个 QSO 是在 2021 年 5 月 14 日的 21:40，我们将波段更改为 40m，但仍然在 SSB 上。如果没有给出 RST 信息，语法将为每个新的 QSO 使用 59。因此，我们可以添加另一个 QSO，它在两天后的同一时间发生。日期必须是 YYYY-MM-DD 格式。"; -$lang['qso_simplefle_syntax_help_ln7'] = "有关语法的更多信息，请查看 DF3CB 的网站此处。"; +$lang['qso_simplefle_syntax_help_ln7'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; $lang['qso_simplefle_syntax_help_ln8'] = ""; $lang['qso_simplefle_syntax_help_ln9'] = ""; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index a70faf488..0117139a0 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index 461a3a287..e2e30f317 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 7da9c971c..e97395515 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 1ce936320..bfdb7906c 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index 754eac6d2..e70249a11 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index f3967fc41..c1218251c 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "Zum Beispiel ein QSO um 21:34 Uhr (UTC $lang['qso_simplefle_syntax_help_ln6'] = "Wenn du keine RST-Informationen angibst, verwendet die Syntax 59 (599 für Daten). Unser nächstes QSO war nicht auf beiden Seiten 59, also geben wir die Informationen zuerst mit gesendeter RST an. Es war 2 Minuten später als das erste QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "Das erste QSO war um 21:34 Uhr, und das zweite 2 Minuten später um 21:36 Uhr. Wir schreiben '6' für die geänderte Minute, da dies die einzige geänderte Information ist. Die Eingaben zum Band und Mode haben sich nicht geändert, daher entfallen diese Daten hier."; $lang['qso_simplefle_syntax_help_ln8'] = "Für unser nächstes QSO um 21:40 Uhr am 14.05.2021 haben wir das Band auf 40m geändert, sind aber immer noch auf SSB. Wenn keine RST-Informationen angegeben sind, verwendet die Syntax bei jedem neuen QSO 59. Daher können wir ein weiteres QSO hinzufügen welches um die exakt selbe Zeit zwei Tage später stattfand. Das Datum muss im Format YYYY-MM-DD eingegeben werden."; -$lang['qso_simplefle_syntax_help_ln9'] = "Für weitere Informationen zur Syntax siehe die Website von DF3CB hier."; +$lang['qso_simplefle_syntax_help_ln9'] = "Eine vollständige Übersicht aller Befehle und der notwendigen Syntax findest du in diesem Artikel in unserem Wiki."; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index 80cdf2b35..3533ae37c 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 74da9eb04..ebf0f9d09 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index cfc2f9c14..c27eab374 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index fbd04c86e..b17557542 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "Например, QSO, начавше $lang['qso_simplefle_syntax_help_ln6'] = "Если вы не предоставите никакой RST-информации, синтаксис будет использовать 59 (599 для данных). В нашем следующем QSO не было 59 с обеих сторон, поэтому мы предоставляем информацию с отправленным RST первыми. Это произошло на 2 минуты позже, чем первое QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "Первое QSO состоялось в 21:34, а второе - на 2 минуты позже, в 21:36. Мы записываем 6, потому что это единственные данные, которые здесь изменились. Информация о диапазоне и режиме не изменилась, поэтому эти данные опущены."; $lang['qso_simplefle_syntax_help_ln8'] = "Для следующего QSO в 21:40 14 мая 2021 года мы сменили диапазон на 40 м, но по-прежнему на SSB. Если информация о RST не указана, то синтаксис будет использовать 59 для каждого нового QSO. Поэтому мы можем добавить еще одно QSO, состоявшееся точно в это же время двумя днями позже. Дата должна быть в формате YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "Более подробную информацию о синтаксисе можно найти на сайте DF3CB здесь."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 0151729dc..bff79b9c8 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "Por ejemplo, un QSO que ha iniciado a $lang['qso_simplefle_syntax_help_ln6'] = "Si no introduce ninguna información RST, la sintaxis usará 59 (o 599 para datos). Nuestro siguiente QSO no era 59 en ambos lados, así que proveemos la información con el RST enviado primero. Fue 2 minutos después del primer QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "El primer QSL fue a las 21:34, y el segundo 2 minutos después a las 21:36. Escribimos 6 porque fue el único dato que cambió. La información de banda y modo no cambió, así que estos datos se omiten."; $lang['qso_simplefle_syntax_help_ln8'] = "Para nuestro siguiente QSO a las 21:40 el 14 de mayo de 2021, cambiamos la banda a 40m pero seguimos en SSB. Si no se ingresa datos de RST, la sintaxis usará 59 para cada nuevo QSO. Por lo tanto podemos añadir un nuevo QSO que ocurrió a la misma hora dos días después. La fecha debe estar en el formato YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "Para mayor información acerca de la sintaxis, por favor consulte el sitio de DF3CB aquí."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index e50d1dfbc..d751d3c43 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index 3a2bffaf6..38f110e5f 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -96,5 +96,5 @@ $lang['qso_simplefle_syntax_help_ln5'] = "For example, a QSO that started at 21: $lang['qso_simplefle_syntax_help_ln6'] = "If you don't provide any RST information, the syntax will use 59 (599 for data). Our next QSO wasn't 59 on both sides, so we provide the information with the sent RST first. It was 2 minutes later than the first QSO."; $lang['qso_simplefle_syntax_help_ln7'] = "The first QSO was at 21:34, and the second one 2 minutes later at 21:36. We write down 6 because this is the only data that changed here. The information about band and mode didn't change, so this data is omitted."; $lang['qso_simplefle_syntax_help_ln8'] = "For our next QSO at 21:40 on 14th May, 2021, we changed the band to 40m but still on SSB. If no RST information is given, the syntax will use 59 for every new QSO. Therefore we can add another QSO which took place at the exact same time two days later. The date must be in format YYYY-MM-DD."; -$lang['qso_simplefle_syntax_help_ln9'] = "For further information about the syntax, please check the website of DF3CB here."; +$lang['qso_simplefle_syntax_help_ln9'] = "A full summary of all commands and the necessary syntax can be found in this article of our Wiki."; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 0dae91312..5c8b3d12e 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -81,12 +81,11 @@ diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 5cf1d2930..810b75038 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -171,7 +171,8 @@ function handleInput() { qsotime = qsotime.slice(0, -2) + item; } else if ( item.match( - /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i + // SOTA | IOTA | POTA | WWFF // + /^[A-Z0-9]{1,3}\/[A-Z]{2}-\d{3}|[AENOS]*[FNSUACA]-\d{3}|(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}(?:,((?!.*FF)[A-Z0-9]{1,3}-\d{4,5}))*|[A-Z0-9]{1,3}[F]{2}-\d{4}$/i ) ) { sotaWwff = item.toUpperCase(); @@ -689,7 +690,7 @@ function isIOTA(value) { } function isPOTA(value) { - if (value.match(/^(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}$/)) { + if (value.match(/^(?!.*FF)[A-Z0-9]{1,3}-\d{4,5}(?:,((?!.*FF)[A-Z0-9]{1,3}-\d{4,5}))*$/)) { return true; } }