Skip to content

Use translation-ids for user relation types #1857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
Merged

Use translation-ids for user relation types #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d2f89
use translation-ids for user relation types
Fasse Oct 6, 2025
dc1fb45
replace translation id with SYS prefix
Fasse Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions demo/admidio-mysql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4066,14 +4066,14 @@ CREATE TABLE `%PREFIX%_user_relation_types` (
--

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
(1, '3f716ce8-f05e-4eb9-a89e-20a8a277aa18', 'INS_PARENT', 'INS_FATHER', 'INS_MOTHER', 0, 2, 2, '2016-11-22 04:29:56', NULL, NULL),
(2, 'e728bdd5-cc1f-46a3-aef3-a3a12cc8aad6', 'INS_CHILD', 'INS_SON', 'INS_DAUGHTER', 0, 1, 2, '2016-11-22 04:29:56', NULL, NULL),
(3, '7d31dd74-77a4-461d-9402-37ae8fe2cfcf', 'INS_SIBLING', 'INS_BROTHER', 'INS_SISTER', 0, 3, 2, '2016-11-22 04:29:56', NULL, NULL),
(4, '91b3c6a0-2559-4e7a-bfcc-4f47e56efd35', 'INS_SPOUSE', 'INS_HUSBAND', 'INS_WIFE', 0, 4, 2, '2016-11-22 04:29:56', NULL, NULL),
(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),
(1, '3f716ce8-f05e-4eb9-a89e-20a8a277aa18', 'SYS_PARENT', 'SYS_FATHER', 'SYS_MOTHER', 0, 2, 2, '2016-11-22 04:29:56', NULL, NULL),
(2, 'e728bdd5-cc1f-46a3-aef3-a3a12cc8aad6', 'SYS_CHILD', 'SYS_SON', 'SYS_DAUGHTER', 0, 1, 2, '2016-11-22 04:29:56', NULL, NULL),
(3, '7d31dd74-77a4-461d-9402-37ae8fe2cfcf', 'SYS_SIBLING', 'SYS_BROTHER', 'SYS_SISTER', 0, 3, 2, '2016-11-22 04:29:56', NULL, NULL),
(4, '91b3c6a0-2559-4e7a-bfcc-4f47e56efd35', 'SYS_SPOUSE', 'SYS_HUSBAND', 'SYS_WIFE', 0, 4, 2, '2016-11-22 04:29:56', NULL, NULL),
(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),
(6, '7a7acc74-7c9f-404f-bd74-abe7482c4126', 'SYS_COMPANION', 'SYS_BOYFRIEND', 'SYS_GIRLFRIEND', 0, 6, 2, '2016-11-22 04:29:56', NULL, NULL),
(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),
(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);
(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);

--
-- Indizes der exportierten Tabellen
Expand Down
16 changes: 8 additions & 8 deletions install/install_steps/start_installation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,14 @@
// create user relation types
$sql = 'INSERT INTO '.TBL_USER_RELATION_TYPES.'
(urt_id, urt_uuid, urt_name, urt_name_male, urt_name_female, urt_id_inverse, urt_usr_id_create, urt_timestamp_create)
VALUES (1, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_PARENT').'\', \''.$gL10n->get('INS_FATHER').'\', \''.$gL10n->get('INS_MOTHER').'\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (2, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_CHILD').'\', \''.$gL10n->get('INS_SON').'\', \''.$gL10n->get('INS_DAUGHTER').'\', 1, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (3, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_SIBLING').'\', \''.$gL10n->get('INS_BROTHER').'\', \''.$gL10n->get('INS_SISTER').'\', 3, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (4, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_SPOUSE').'\', \''.$gL10n->get('INS_HUSBAND').'\', \''.$gL10n->get('INS_WIFE').'\', 4, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (5, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_COHABITANT').'\', \''.$gL10n->get('INS_COHABITANT_MALE').'\', \''.$gL10n->get('INS_COHABITANT_FEMALE').'\', 5, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (6, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('SYS_COMPANION').'\', \''.$gL10n->get('SYS_BOYFRIEND').'\', \''.$gL10n->get('SYS_GIRLFRIEND').'\', 6, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (7, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('SYS_SUPERIOR').'\', \''.$gL10n->get('SYS_SUPERIOR_MALE').'\', \''.$gL10n->get('SYS_SUPERIOR_FEMALE').'\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (8, \'' . Uuid::uuid4() . '\', \''.$gL10n->get('INS_SUBORDINATE').'\', \''.$gL10n->get('INS_SUBORDINATE_MALE').'\', \''.$gL10n->get('INS_SUBORDINATE_FEMALE').'\', 7, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')';
VALUES (1, \'' . Uuid::uuid4() . '\', \'SYS_PARENT\', \'SYS_FATHER\', \'SYS_MOTHER\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (2, \'' . Uuid::uuid4() . '\', \'SYS_CHILD\', \'SYS_SON\', \'SYS_DAUGHTER\', 1, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (3, \'' . Uuid::uuid4() . '\', \'SYS_SIBLING\', \'SYS_BROTHER\', \'SYS_SISTER\', 3, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (4, \'' . Uuid::uuid4() . '\', \'SYS_SPOUSE\', \'SYS_HUSBAND\', \'SYS_WIFE\', 4, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (5, \'' . Uuid::uuid4() . '\', \'SYS_COHABITANT\', \'SYS_COHABITANT_MALE\', \'SYS_COHABITANT_FEMALE\', 5, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (6, \'' . Uuid::uuid4() . '\', \'SYS_COMPANION\', \'SYS_BOYFRIEND\', \'SYS_GIRLFRIEND\', 6, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (7, \'' . Uuid::uuid4() . '\', \'SYS_SUPERIOR\', \'SYS_SUPERIOR_MALE\', \'SYS_SUPERIOR_FEMALE\', null, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')
, (8, \'' . Uuid::uuid4() . '\', \'SYS_SUBORDINATE\', \'SYS_SUBORDINATE_MALE\', \'SYS_SUBORDINATE_FEMALE\', 7, '.$gCurrentUserId.', \''. DATETIME_NOW.'\')';
$db->query($sql); // TODO add more params

$sql = 'UPDATE '.TBL_USER_RELATION_TYPES.'
Expand Down
36 changes: 18 additions & 18 deletions languages/bg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,29 +106,29 @@
<string name="INS_WELCOME_TEXT_UPDATE">Вече сте актуализирали директориите на Admidio с нова версия. Сега базата данни трябва да бъде актуализирана от текущата версия #VAR2# до версия #VAR1#, за да може Admidio да работи с новата версия.\n\nАко имате въпроси или проблеми с актуализацията, моля, проверете #VAR3#нашата актуализирайте инструкцията#VAR4# или се свържете с #VAR5#нашия форум за поддръжка#VAR6#.</string>
<string name="INS_WRONG_MYSQL_VERSION">Admidio #VAR1# изисква поне версия на MySQL #VAR2#. Моля, опитайте да актуализирате вашата MySQL база данни или използвайте #VAR3#по-стара версия на Admidio#VAR4#, за да осигурите съвместимост.</string>
<string name="INS_BOYFRIEND">Приятел</string>
<string name="INS_BROTHER">Брат</string>
<string name="INS_CHILD">Дете</string>
<string name="INS_COHABITANT">Партньор</string>
<string name="INS_COHABITANT_MALE">Партньор</string>
<string name="INS_COHABITANT_FEMALE">Партньор</string>
<string name="SYS_BROTHER">Брат</string>
<string name="SYS_CHILD">Дете</string>
<string name="SYS_COHABITANT">Партньор</string>
<string name="SYS_COHABITANT_MALE">Партньор</string>
<string name="SYS_COHABITANT_FEMALE">Партньор</string>
<string name="INS_COMPANION">Приятел</string>
<string name="INS_DAUGHTER">Дъщеря</string>
<string name="INS_FATHER">Баща</string>
<string name="SYS_DAUGHTER">Дъщеря</string>
<string name="SYS_FATHER">Баща</string>
<string name="INS_GIRLFRIEND">Приятелка</string>
<string name="INS_HUSBAND">Съпруг</string>
<string name="INS_MOTHER">Майка</string>
<string name="INS_PARENT">Родител</string>
<string name="INS_SUBORDINATE">Подчинен</string>
<string name="INS_SUBORDINATE_MALE">Мъж подчинен</string>
<string name="INS_SUBORDINATE_FEMALE">Жена подчинен</string>
<string name="SYS_HUSBAND">Съпруг</string>
<string name="SYS_MOTHER">Майка</string>
<string name="SYS_PARENT">Родител</string>
<string name="SYS_SUBORDINATE">Подчинен</string>
<string name="SYS_SUBORDINATE_MALE">Мъж подчинен</string>
<string name="SYS_SUBORDINATE_FEMALE">Жена подчинен</string>
<string name="INS_SUPERIOR">Ръководител</string>
<string name="INS_SUPERIOR_MALE">Ръководител</string>
<string name="INS_SUPERIOR_FEMALE">Жена ръководител</string>
<string name="INS_SIBLING">Сестра или брат</string>
<string name="INS_SISTER">Сестра</string>
<string name="INS_SON">Син</string>
<string name="INS_SPOUSE">Съпруг</string>
<string name="INS_WIFE">Съпруга</string>
<string name="SYS_SIBLING">Сестра или брат</string>
<string name="SYS_SISTER">Сестра</string>
<string name="SYS_SON">Син</string>
<string name="SYS_SPOUSE">Съпруг</string>
<string name="SYS_WIFE">Съпруга</string>
<!--Phrases only in organization administration-->
<string name="ORG_ACCESS_TO_MODULE">Достъп до модула</string>
<string name="ORG_ACCESS_TO_MODULE_DESC">Модулът може да бъде деактивиран или активиран само за влезли потребители. Ако модулът е достъпен само за влезли потребители, той ще бъде скрит за потребители, които не са влезли в сайта. (По подразбиране: Активиран)</string>
Expand Down
36 changes: 18 additions & 18 deletions languages/da.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<string name="INS_ADDRESS_LIST">Adresseliste</string>
<string name="INS_ADMINISTRATOR_LOGIN_DESC">En opdatering kan kun foretages af en administrator. Venligst definer administratorens rettigheder.</string>
<string name="INS_BOARD">Bestyrelsen</string>
<string name="INS_BROTHER">Bror</string>
<string name="INS_CHILD">Barn</string>
<string name="INS_COHABITANT">Partner</string>
<string name="INS_COHABITANT_FEMALE">Partner</string>
<string name="INS_COHABITANT_MALE">Partner</string>
<string name="SYS_BROTHER">Bror</string>
<string name="SYS_CHILD">Barn</string>
<string name="SYS_COHABITANT">Partner</string>
<string name="SYS_COHABITANT_FEMALE">Partner</string>
<string name="SYS_COHABITANT_MALE">Partner</string>
<string name="INS_CONFERENCE_ROOM">Konference rum</string>
<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>
<string name="INS_CONTINUE_INSTALLATION">Fortsæt installation</string>
Expand All @@ -29,7 +29,7 @@
<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>
<string name="INS_DATABASE_SYSTEM">Database system</string>
<string name="INS_DATABASE_TYPE_INVALID">Admidio understøtter kun MariaDB, MySQL og PostgreSQL.</string>
<string name="INS_DAUGHTER">Datter</string>
<string name="SYS_DAUGHTER">Datter</string>
<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>
<string name="INS_DESCRIPTION_ADMINISTRATOR">System administrator gruppe</string>
<string name="INS_DESCRIPTION_BOARD">Organisationens Bestyrelse</string>
Expand All @@ -39,33 +39,33 @@
<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>
<string name="INS_ENTER_LOGIN_TO_DATABASE">Indtast database adgangs information</string>
<string name="INS_ERROR_OPEN_FILE">Filen #VAR1_BOLD# kunne ikke åbnes.</string>
<string name="INS_FATHER">Far</string>
<string name="SYS_FATHER">Far</string>
<string name="INS_GROUPS">Grupper</string>
<string name="INS_HOST_INVALID">Hostnavnet er ikke gyldigt. Indtast et gyldigt hostnavn eller IP adresse.</string>
<string name="INS_HUSBAND">Mand</string>
<string name="SYS_HUSBAND">Mand</string>
<string name="INS_INSTALL_ADMIDIO">Installer Admidio</string>
<string name="INS_INSTALLATION">Installation</string>
<string name="INS_INSTALLATION_EXISTS">Databasen indeholder allerede en Admidio installation. Endnu en installation er ikke mulig.</string>
<string name="INS_INSTALLATION_VERSION">Installation af version #VAR1#</string>
<string name="INS_INTERN">Intern</string>
<string name="INS_LANGUAGE_NOT_CHOSEN">Intet sprog valgt</string>
<string name="INS_MEMBERSHIP">Medlemskab</string>
<string name="INS_MOTHER">Mor</string>
<string name="SYS_MOTHER">Mor</string>
<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>
<string name="INS_ORGA_SHORTNAME_EXISTS">Organisationen #VAR1_BOLD# eksisterer allerede. Venligst vælg et andet navn.</string>
<string name="INS_PARENT">Forælder</string>
<string name="SYS_PARENT">Forælder</string>
<string name="INS_PHONE_LIST">Telefonliste</string>
<string name="INS_PLEASE_CHOOSE_LANGUAGE">Venligst vælg et sprog</string>
<string name="INS_SET_ORGANIZATION">Opretter organisation</string>
<string name="INS_SET_UP_ORGANIZATION">Konfigurer organisation</string>
<string name="INS_SETUP_WAS_SUCCESSFUL">Konfiguration færdig</string>
<string name="INS_SIBLING">Søskende</string>
<string name="INS_SISTER">Søster</string>
<string name="INS_SON">Søn</string>
<string name="INS_SPOUSE">Ægtefælle</string>
<string name="INS_SUBORDINATE">Underordnet</string>
<string name="INS_SUBORDINATE_FEMALE">Kvindelig underordnet</string>
<string name="INS_SUBORDINATE_MALE">Mandlig underordnet</string>
<string name="SYS_SIBLING">Søskende</string>
<string name="SYS_SISTER">Søster</string>
<string name="SYS_SON">Søn</string>
<string name="SYS_SPOUSE">Ægtefælle</string>
<string name="SYS_SUBORDINATE">Underordnet</string>
<string name="SYS_SUBORDINATE_FEMALE">Kvindelig underordnet</string>
<string name="SYS_SUBORDINATE_MALE">Mandlig underordnet</string>
<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>
<string name="INS_TABLE_PREFIX">Tabel prefix</string>
<string name="INS_TEAMS">Teams</string>
Expand All @@ -81,7 +81,7 @@
<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>
<string name="INS_WELCOME_TO_INSTALLATION">Velkommen til installationen af Admidio</string>
<string name="INS_WELCOME_TO_UPDATE">Velkommen til Admidio opdatering</string>
<string name="INS_WIFE">Kone</string>
<string name="SYS_WIFE">Kone</string>
<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>
<string name="SYS_BOYFRIEND">Kæreste</string>
<string name="SYS_COMPANION">Ledsager</string>
Expand Down
Loading