Skip to content

Commit b8f0833

Browse files
FasseFasse
authored
Merge pull request #1857 from Admidio/use-translation-ids-for-user-relation-types
Use translation-ids for user relation types
2 parents 7c4de47 + dc1fb45 commit b8f0833

File tree

27 files changed

+448
-425
lines changed

27 files changed

+448
-425
lines changed

‎demo/admidio-mysql.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4066,14 +4066,14 @@ CREATE TABLE `%PREFIX%_user_relation_types` (
40664066
--
40674067

40684068
INSERT INTO `%PREFIX%_user_relation_types` (`urt_id`, `urt_uuid`, `urt_name`, `urt_name_male`, `urt_name_female`, `urt_edit_user`, `urt_id_inverse`, `urt_usr_id_create`, `urt_timestamp_create`, `urt_usr_id_change`, `urt_timestamp_change`) VALUES
4069-
(1, '3f716ce8-f05e-4eb9-a89e-20a8a277aa18', 'INS_PARENT', 'INS_FATHER', 'INS_MOTHER', 0, 2, 2, '2016-11-22 04:29:56', NULL, NULL),
4070-
(2, 'e728bdd5-cc1f-46a3-aef3-a3a12cc8aad6', 'INS_CHILD', 'INS_SON', 'INS_DAUGHTER', 0, 1, 2, '2016-11-22 04:29:56', NULL, NULL),
4071-
(3, '7d31dd74-77a4-461d-9402-37ae8fe2cfcf', 'INS_SIBLING', 'INS_BROTHER', 'INS_SISTER', 0, 3, 2, '2016-11-22 04:29:56', NULL, NULL),
4072-
(4, '91b3c6a0-2559-4e7a-bfcc-4f47e56efd35', 'INS_SPOUSE', 'INS_HUSBAND', 'INS_WIFE', 0, 4, 2, '2016-11-22 04:29:56', NULL, NULL),
4073-
(5, 'be687ee3-bd7d-499e-b388-b0387fb89389', 'INS_COHABITANT', 'INS_COHABITANT_MALE', 'INS_COHABITANT_FEMALE', 0, 5, 2, '2016-11-22 04:29:56', NULL, NULL),
4069+
(1, '3f716ce8-f05e-4eb9-a89e-20a8a277aa18', 'SYS_PARENT', 'SYS_FATHER', 'SYS_MOTHER', 0, 2, 2, '2016-11-22 04:29:56', NULL, NULL),
4070+
(2, 'e728bdd5-cc1f-46a3-aef3-a3a12cc8aad6', 'SYS_CHILD', 'SYS_SON', 'SYS_DAUGHTER', 0, 1, 2, '2016-11-22 04:29:56', NULL, NULL),
4071+
(3, '7d31dd74-77a4-461d-9402-37ae8fe2cfcf', 'SYS_SIBLING', 'SYS_BROTHER', 'SYS_SISTER', 0, 3, 2, '2016-11-22 04:29:56', NULL, NULL),
4072+
(4, '91b3c6a0-2559-4e7a-bfcc-4f47e56efd35', 'SYS_SPOUSE', 'SYS_HUSBAND', 'SYS_WIFE', 0, 4, 2, '2016-11-22 04:29:56', NULL, NULL),
4073+
(5, 'be687ee3-bd7d-499e-b388-b0387fb89389', 'SYS_COHABITANT', 'SYS_COHABITANT_MALE', 'SYS_COHABITANT_FEMALE', 0, 5, 2, '2016-11-22 04:29:56', NULL, NULL),
40744074
(6, '7a7acc74-7c9f-404f-bd74-abe7482c4126', 'SYS_COMPANION', 'SYS_BOYFRIEND', 'SYS_GIRLFRIEND', 0, 6, 2, '2016-11-22 04:29:56', NULL, NULL),
40754075
(7, '7169f73a-49a9-4ce3-981a-102c6eb2c3c9', 'SYS_SUPERIOR', 'SYS_SUPERIOR_MALE', 'SYS_SUPERIOR_FEMALE', 0, 8, 2, '2016-11-22 04:29:56', NULL, NULL),
4076-
(8, 'a7ab66fb-67c1-4828-aeda-dc31d09050dc', 'INS_SUBORDINATE', 'INS_SUBORDINATE_MALE', 'INS_SUBORDINATE_FEMALE', 0, 7, 2, '2016-11-22 04:29:56', NULL, NULL);
4076+
(8, 'a7ab66fb-67c1-4828-aeda-dc31d09050dc', 'SYS_SUBORDINATE', 'SYS_SUBORDINATE_MALE', 'SYS_SUBORDINATE_FEMALE', 0, 7, 2, '2016-11-22 04:29:56', NULL, NULL);
40774077

40784078
--
40794079
-- Indizes der exportierten Tabellen

‎install/install_steps/start_installation.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@
169169
// create user relation types
170170
$sql = 'INSERT INTO '.TBL_USER_RELATION_TYPES.'
171171
(urt_id, urt_uuid, urt_name, urt_name_male, urt_name_female, urt_id_inverse, urt_usr_id_create, urt_timestamp_create)
172-
VALUES (1, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_PARENT').'\', \''.$gL10n->get('INS_FATHER').'\', \''.$gL10n->get('INS_MOTHER').'\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
173-
, (2, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_CHILD').'\', \''.$gL10n->get('INS_SON').'\', \''.$gL10n->get('INS_DAUGHTER').'\', 1, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
174-
, (3, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_SIBLING').'\', \''.$gL10n->get('INS_BROTHER').'\', \''.$gL10n->get('INS_SISTER').'\', 3, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
175-
, (4, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_SPOUSE').'\', \''.$gL10n->get('INS_HUSBAND').'\', \''.$gL10n->get('INS_WIFE').'\', 4, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
176-
, (5, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_COHABITANT').'\', \''.$gL10n->get('INS_COHABITANT_MALE').'\', \''.$gL10n->get('INS_COHABITANT_FEMALE').'\', 5, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
177-
, (6, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('SYS_COMPANION').'\', \''.$gL10n->get('SYS_BOYFRIEND').'\', \''.$gL10n->get('SYS_GIRLFRIEND').'\', 6, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
178-
, (7, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('SYS_SUPERIOR').'\', \''.$gL10n->get('SYS_SUPERIOR_MALE').'\', \''.$gL10n->get('SYS_SUPERIOR_FEMALE').'\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
179-
, (8, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_SUBORDINATE').'\', \''.$gL10n->get('INS_SUBORDINATE_MALE').'\', \''.$gL10n->get('INS_SUBORDINATE_FEMALE').'\', 7, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')';
172+
VALUES (1, \'' . Uuid::uuid4() . '\', \'SYS_PARENT\', \'SYS_FATHER\', \'SYS_MOTHER\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
173+
, (2, \'' . Uuid::uuid4() . '\', \'SYS_CHILD\', \'SYS_SON\', \'SYS_DAUGHTER\', 1, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
174+
, (3, \'' . Uuid::uuid4() . '\', \'SYS_SIBLING\', \'SYS_BROTHER\', \'SYS_SISTER\', 3, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
175+
, (4, \'' . Uuid::uuid4() . '\', \'SYS_SPOUSE\', \'SYS_HUSBAND\', \'SYS_WIFE\', 4, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
176+
, (5, \'' . Uuid::uuid4() . '\', \'SYS_COHABITANT\', \'SYS_COHABITANT_MALE\', \'SYS_COHABITANT_FEMALE\', 5, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
177+
, (6, \'' . Uuid::uuid4() . '\', \'SYS_COMPANION\', \'SYS_BOYFRIEND\', \'SYS_GIRLFRIEND\', 6, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
178+
, (7, \'' . Uuid::uuid4() . '\', \'SYS_SUPERIOR\', \'SYS_SUPERIOR_MALE\', \'SYS_SUPERIOR_FEMALE\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
179+
, (8, \'' . Uuid::uuid4() . '\', \'SYS_SUBORDINATE\', \'SYS_SUBORDINATE_MALE\', \'SYS_SUBORDINATE_FEMALE\', 7, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')';
180180
$db->query($sql); // TODO add more params
181181

182182
$sql = 'UPDATE '.TBL_USER_RELATION_TYPES.'

‎languages/bg.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,29 +106,29 @@
106106
<string name="INS_WELCOME_TEXT_UPDATE">Вече сте актуализирали директориите на Admidio с нова версия. Сега базата данни трябва да бъде актуализирана от текущата версия #VAR2# до версия #VAR1#, за да може Admidio да работи с новата версия.\n\nАко имате въпроси или проблеми с актуализацията, моля, проверете #VAR3#нашата актуализирайте инструкцията#VAR4# или се свържете с #VAR5#нашия форум за поддръжка#VAR6#.</string>
107107
<string name="INS_WRONG_MYSQL_VERSION">Admidio #VAR1# изисква поне версия на MySQL #VAR2#. Моля, опитайте да актуализирате вашата MySQL база данни или използвайте #VAR3#по-стара версия на Admidio#VAR4#, за да осигурите съвместимост.</string>
108108
<string name="INS_BOYFRIEND">Приятел</string>
109-
<string name="INS_BROTHER">Брат</string>
110-
<string name="INS_CHILD">Дете</string>
111-
<string name="INS_COHABITANT">Партньор</string>
112-
<string name="INS_COHABITANT_MALE">Партньор</string>
113-
<string name="INS_COHABITANT_FEMALE">Партньор</string>
109+
<string name="SYS_BROTHER">Брат</string>
110+
<string name="SYS_CHILD">Дете</string>
111+
<string name="SYS_COHABITANT">Партньор</string>
112+
<string name="SYS_COHABITANT_MALE">Партньор</string>
113+
<string name="SYS_COHABITANT_FEMALE">Партньор</string>
114114
<string name="INS_COMPANION">Приятел</string>
115-
<string name="INS_DAUGHTER">Дъщеря</string>
116-
<string name="INS_FATHER">Баща</string>
115+
<string name="SYS_DAUGHTER">Дъщеря</string>
116+
<string name="SYS_FATHER">Баща</string>
117117
<string name="INS_GIRLFRIEND">Приятелка</string>
118-
<string name="INS_HUSBAND">Съпруг</string>
119-
<string name="INS_MOTHER">Майка</string>
120-
<string name="INS_PARENT">Родител</string>
121-
<string name="INS_SUBORDINATE">Подчинен</string>
122-
<string name="INS_SUBORDINATE_MALE">Мъж подчинен</string>
123-
<string name="INS_SUBORDINATE_FEMALE">Жена подчинен</string>
118+
<string name="SYS_HUSBAND">Съпруг</string>
119+
<string name="SYS_MOTHER">Майка</string>
120+
<string name="SYS_PARENT">Родител</string>
121+
<string name="SYS_SUBORDINATE">Подчинен</string>
122+
<string name="SYS_SUBORDINATE_MALE">Мъж подчинен</string>
123+
<string name="SYS_SUBORDINATE_FEMALE">Жена подчинен</string>
124124
<string name="INS_SUPERIOR">Ръководител</string>
125125
<string name="INS_SUPERIOR_MALE">Ръководител</string>
126126
<string name="INS_SUPERIOR_FEMALE">Жена ръководител</string>
127-
<string name="INS_SIBLING">Сестра или брат</string>
128-
<string name="INS_SISTER">Сестра</string>
129-
<string name="INS_SON">Син</string>
130-
<string name="INS_SPOUSE">Съпруг</string>
131-
<string name="INS_WIFE">Съпруга</string>
127+
<string name="SYS_SIBLING">Сестра или брат</string>
128+
<string name="SYS_SISTER">Сестра</string>
129+
<string name="SYS_SON">Син</string>
130+
<string name="SYS_SPOUSE">Съпруг</string>
131+
<string name="SYS_WIFE">Съпруга</string>
132132
<!--Phrases only in organization administration-->
133133
<string name="ORG_ACCESS_TO_MODULE">Достъп до модула</string>
134134
<string name="ORG_ACCESS_TO_MODULE_DESC">Модулът може да бъде деактивиран или активиран само за влезли потребители. Ако модулът е достъпен само за влезли потребители, той ще бъде скрит за потребители, които не са влезли в сайта. (По подразбиране: Активиран)</string>

‎languages/da.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<string name="INS_ADDRESS_LIST">Adresseliste</string>
66
<string name="INS_ADMINISTRATOR_LOGIN_DESC">En opdatering kan kun foretages af en administrator. Venligst definer administratorens rettigheder.</string>
77
<string name="INS_BOARD">Bestyrelsen</string>
8-
<string name="INS_BROTHER">Bror</string>
9-
<string name="INS_CHILD">Barn</string>
10-
<string name="INS_COHABITANT">Partner</string>
11-
<string name="INS_COHABITANT_FEMALE">Partner</string>
12-
<string name="INS_COHABITANT_MALE">Partner</string>
8+
<string name="SYS_BROTHER">Bror</string>
9+
<string name="SYS_CHILD">Barn</string>
10+
<string name="SYS_COHABITANT">Partner</string>
11+
<string name="SYS_COHABITANT_FEMALE">Partner</string>
12+
<string name="SYS_COHABITANT_MALE">Partner</string>
1313
<string name="INS_CONFERENCE_ROOM">Konference rum</string>
1414
<string name="INS_CONFIGURATION_FILE_NOT_FOUND">Fil #VAR1_BOLD# kan ikke findes i hoved folderen for Admidio!\n\nVenligst download filen igen og kopier den til den oplyste folder.</string>
1515
<string name="INS_CONTINUE_INSTALLATION">Fortsæt installation</string>
@@ -29,7 +29,7 @@
2929
<string name="INS_DATABASE_PORT_INVALID">Den specificerede port er ikke gyldig. For at vælge en gyldig port skal du vælge én blandt 1 og 65535, eller lade porten være blank.</string>
3030
<string name="INS_DATABASE_SYSTEM">Database system</string>
3131
<string name="INS_DATABASE_TYPE_INVALID">Admidio understøtter kun MariaDB, MySQL og PostgreSQL.</string>
32-
<string name="INS_DAUGHTER">Datter</string>
32+
<string name="SYS_DAUGHTER">Datter</string>
3333
<string name="INS_DELETE_CONFIG_FILE">Admidio\'s hoved bibliotek #VAR1_BOLD# indeholder en config.php. Den er allerede blevet kopieret til adm_my_files folderen. Venligst slet den fra hoved biblioteket.</string>
3434
<string name="INS_DESCRIPTION_ADMINISTRATOR">System administrator gruppe</string>
3535
<string name="INS_DESCRIPTION_BOARD">Organisationens Bestyrelse</string>
@@ -39,33 +39,33 @@
3939
<string name="INS_DOWNLOAD_CONFIGURATION_FILE_DESC">Konfigurations filen #VAR1_BOLD# kunne ikke gemmes i folderen #VAR2_BOLD#. Venligst arranger skrive rettigheder til den folder (ret fil rettigheder via ftp program til 0777 eller drwxrwxrwx) eller download konfigurations filen og kopier den ind i Admidio folderen #VAR3_BOLD# ved hjælp af et FTP program.\n\nEfter filen er blevet uploaded til denne folder så kan du fortsætte installationen.</string>
4040
<string name="INS_ENTER_LOGIN_TO_DATABASE">Indtast database adgangs information</string>
4141
<string name="INS_ERROR_OPEN_FILE">Filen #VAR1_BOLD# kunne ikke åbnes.</string>
42-
<string name="INS_FATHER">Far</string>
42+
<string name="SYS_FATHER">Far</string>
4343
<string name="INS_GROUPS">Grupper</string>
4444
<string name="INS_HOST_INVALID">Hostnavnet er ikke gyldigt. Indtast et gyldigt hostnavn eller IP adresse.</string>
45-
<string name="INS_HUSBAND">Mand</string>
45+
<string name="SYS_HUSBAND">Mand</string>
4646
<string name="INS_INSTALL_ADMIDIO">Installer Admidio</string>
4747
<string name="INS_INSTALLATION">Installation</string>
4848
<string name="INS_INSTALLATION_EXISTS">Databasen indeholder allerede en Admidio installation. Endnu en installation er ikke mulig.</string>
4949
<string name="INS_INSTALLATION_VERSION">Installation af version #VAR1#</string>
5050
<string name="INS_INTERN">Intern</string>
5151
<string name="INS_LANGUAGE_NOT_CHOSEN">Intet sprog valgt</string>
5252
<string name="INS_MEMBERSHIP">Medlemskab</string>
53-
<string name="INS_MOTHER">Mor</string>
53+
<string name="SYS_MOTHER">Mor</string>
5454
<string name="INS_NO_INSTALLED_VERSION_FOUND">Kunne ikke finde den nuværende installation. Hvis du bruger Admidio 1.x, skal du updatere til version 2.x først. Herefter kan du opdatere til version #VAR1#. Hvis du allerede bruger Admidio 2.x eller højere skal du checke forbindelsen til samt integriteten af din database.</string>
5555
<string name="INS_ORGA_SHORTNAME_EXISTS">Organisationen #VAR1_BOLD# eksisterer allerede. Venligst vælg et andet navn.</string>
56-
<string name="INS_PARENT">Forælder</string>
56+
<string name="SYS_PARENT">Forælder</string>
5757
<string name="INS_PHONE_LIST">Telefonliste</string>
5858
<string name="INS_PLEASE_CHOOSE_LANGUAGE">Venligst vælg et sprog</string>
5959
<string name="INS_SET_ORGANIZATION">Opretter organisation</string>
6060
<string name="INS_SET_UP_ORGANIZATION">Konfigurer organisation</string>
6161
<string name="INS_SETUP_WAS_SUCCESSFUL">Konfiguration færdig</string>
62-
<string name="INS_SIBLING">Søskende</string>
63-
<string name="INS_SISTER">Søster</string>
64-
<string name="INS_SON">Søn</string>
65-
<string name="INS_SPOUSE">Ægtefælle</string>
66-
<string name="INS_SUBORDINATE">Underordnet</string>
67-
<string name="INS_SUBORDINATE_FEMALE">Kvindelig underordnet</string>
68-
<string name="INS_SUBORDINATE_MALE">Mandlig underordnet</string>
62+
<string name="SYS_SIBLING">Søskende</string>
63+
<string name="SYS_SISTER">Søster</string>
64+
<string name="SYS_SON">Søn</string>
65+
<string name="SYS_SPOUSE">Ægtefælle</string>
66+
<string name="SYS_SUBORDINATE">Underordnet</string>
67+
<string name="SYS_SUBORDINATE_FEMALE">Kvindelig underordnet</string>
68+
<string name="SYS_SUBORDINATE_MALE">Mandlig underordnet</string>
6969
<string name="INS_SUPPORT_FURTHER_DEVELOPMENT">Vi vil sætte stor pris på hvis du kunne støtte udviklingen af Admidio med en donation!</string>
7070
<string name="INS_TABLE_PREFIX">Tabel prefix</string>
7171
<string name="INS_TEAMS">Teams</string>
@@ -81,7 +81,7 @@
8181
<string name="INS_WELCOME_TEXT_UPDATE">Du har allerede opdateret Admidios kataloger med en ny version. Nu skal databasen opdateres fra den aktuelle version #VAR2# til versionen #VAR1#, så Admidio kan køre med den nye version.\n\nHvis du har spørgsmål eller problemer med opdateringen, skal du kontrollere #VAR3# vores opdater instruktion #VAR4# eller kontakt #VAR5# vores supportforum #VAR6#.</string>
8282
<string name="INS_WELCOME_TO_INSTALLATION">Velkommen til installationen af Admidio</string>
8383
<string name="INS_WELCOME_TO_UPDATE">Velkommen til Admidio opdatering</string>
84-
<string name="INS_WIFE">Kone</string>
84+
<string name="SYS_WIFE">Kone</string>
8585
<string name="INS_WRONG_MYSQL_VERSION">Admidio #VAR1# kræver mindst MariaDB eller MySQL version #VAR2#. Prøv venligst at opdatere din MariaDB- eller MySQL-database eller brug en #VAR3#older Admidio-version#VAR4# for at sikre kompatibilitet.</string>
8686
<string name="SYS_BOYFRIEND">Kæreste</string>
8787
<string name="SYS_COMPANION">Ledsager</string>

0 commit comments

Comments
 (0)