From 5bc59883edd6b2c75034e2f366053a760db55589 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Thu, 6 May 2021 12:39:14 +0200
Subject: [PATCH] [User selectable columns] Added some translations.
---
.../language/english/general_words_lang.php | 3 ++
application/views/dashboard/index.php | 40 +++++++++----------
application/views/user/add.php | 40 +++++++++----------
application/views/user/edit.php | 40 +++++++++----------
.../views/view_log/partial/log_ajax.php | 40 +++++++++----------
5 files changed, 83 insertions(+), 80 deletions(-)
diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index eb95ece8..9f7c057b 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -92,6 +92,9 @@ $lang['gen_hamradio_iota_reference'] = 'IOTA Reference';
$lang['gen_hamradio_sota_reference'] = 'SOTA Reference';
$lang['gen_hamradio_wwff_reference'] = 'WWFF Reference';
$lang['gen_hamradio_dok'] = 'DOK';
+$lang['gen_hamradio_state'] = 'State';
+$lang['gen_hamradio_iota'] = 'IOTA';
+$lang['gen_hamradio_gridsquare'] = 'Gridsquare';
$lang['gen_hamradio_sig'] = 'Sig';
$lang['gen_hamradio_sig_info'] = 'Sig Info';
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 32b7dd27..c590fdda 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -44,48 +44,48 @@
echo '
';
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ' .
'';
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ' .
'';
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ' .
'';
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ';
diff --git a/application/views/user/add.php b/application/views/user/add.php
index 2d4d3283..8444f764 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -142,12 +142,12 @@
@@ -156,12 +156,12 @@
@@ -170,12 +170,12 @@
@@ -184,12 +184,12 @@
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index bbe6b2b2..ff28a285 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -328,12 +328,12 @@
@@ -342,12 +342,12 @@
@@ -356,12 +356,12 @@
@@ -370,12 +370,12 @@
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 4e9a778f..dd46a581 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -10,48 +10,48 @@
echo '';
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ';
echo '';
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ';
echo '';
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ';
echo '';
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
case 'Mode': echo $this->lang->line('gen_hamradio_mode'); break;
- case 'RSTS': echo $this->lang->line('gen_hamradio_rst_sent'); break;
- case 'RSTR': echo $this->lang->line('gen_hamradio_rst_recv'); break;
+ case 'RSTS': echo $this->lang->line('gen_hamradio_rsts'); break;
+ case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
- case 'IOTA': echo 'IOTA'; break;
- case 'State': echo 'State'; break;
- case 'Grid': echo 'Gridsquare'; break;
+ case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
echo ' | ';