Skip to content

Commit 857d594

Browse files
committed
User: Account unification: Language fix content and translation variable to have translation and add missing variables and translation in EN, FR and ES - refs BT#22702
1 parent f1b8439 commit 857d594

File tree

5 files changed

+31
-4
lines changed

5 files changed

+31
-4
lines changed

main/inc/lib/myspace.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static function getAdminActions()
3232
['url' => api_get_path(WEB_CODE_PATH).'mySpace/ti_report.php', 'content' => get_lang('TIReport')],
3333
['url' => api_get_path(WEB_CODE_PATH).'mySpace/question_stats_global.php', 'content' => get_lang('QuestionStats')],
3434
['url' => api_get_path(WEB_CODE_PATH).'mySpace/question_stats_global_detail.php', 'content' => get_lang('ExerciseAttemptStatsReport')],
35-
['url' => api_get_path(WEB_CODE_PATH).'mySpace/duplicated_users.php', 'content' => 'Duplicated users'],
35+
['url' => api_get_path(WEB_CODE_PATH).'mySpace/duplicated_users.php', 'content' => get_lang('DuplicatedUsers')],
3636
];
3737

3838
$field = new ExtraField('user');

main/lang/english/trad4all.inc.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9113,4 +9113,13 @@
91139113
$synthesis = "Synthesis";
91149114
$WeeklyTimeSummary = "Weekly time spent summary";
91159115
$ExistingUserWithSameExtraFieldValue = "An existing user with the same %s was found (ID %d), enrolling instead of creating.";
9116+
$SelectExtraField = "Select the extra field to search on";
9117+
$WhatToDoWithUnifiedUsers = "What to do with unified users";
9118+
$ExtraFieldNotFound = "Extra Field not found";
9119+
$NoDuplicatesFound = "No duplicates found";
9120+
$UnifyToThisUser = "Unify on this user";
9121+
$Unify = "Unify";
9122+
$AreYouSureToUnify = "Are you sure to unify";
9123+
$FinalUser = "Final user";
9124+
$WillMergeNUsers = "Will merge {n} users";
91169125
?>

main/lang/french/trad4all.inc.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9048,4 +9048,13 @@
90489048
$synthesis = "Synthèse";
90499049
$WeeklyTimeSummary = "Synthèse des temps passés par semaine";
90509050
$ExistingUserWithSameExtraFieldValue = "Un utilisateur existant avec le même %s a été trouvé (ID %d), inscription au lieu de créer.";
9051+
$SelectExtraField = "Sélectionnez le champ extra sur lequel effectuer la recherche";
9052+
$WhatToDoWithUnifiedUsers = "Que faire avec les utilisateurs unifiés";
9053+
$ExtraFieldNotFound = "Champ extra non trouvé";
9054+
$NoDuplicatesFound = "Aucun doublon trouvé";
9055+
$UnifyToThisUser = "Unifier sur cet utilisateur";
9056+
$Unify = "Unifier";
9057+
$AreYouSureToUnify = "Êtes-vous sûr d'unifier";
9058+
$FinalUser = "Utilisateur final";
9059+
$WillMergeNUsers = "Fusionnera {n} utilisateurs";
90519060
?>

main/lang/spanish/trad4all.inc.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9138,4 +9138,13 @@
91389138
$synthesis = "Síntesis";
91399139
$WeeklyTimeSummary = "Resumen de tiempo dedicado por semana";
91409140
$ExistingUserWithSameExtraFieldValue = "Se encontró el mismo %s con un usuario existente (ID %d), se procederá a matricularlo en lugar de crear uno nuevo.";
9141+
$SelectExtraField = "Seleccione el campo extra para buscar";
9142+
$WhatToDoWithUnifiedUsers = "Que hacer con los usuarios unificados";
9143+
$ExtraFieldNotFound = "Campo extra no encontrado";
9144+
$NoDuplicatesFound = "No se encontraron duplicados";
9145+
$UnifyToThisUser = "Unificar a este usuario";
9146+
$Unify = "Unificar";
9147+
$AreYouSureToUnify = "Estas seguro de unificar";
9148+
$FinalUser = "Usuario final";
9149+
$WillMergeNUsers = "Fusionará {n} usuarios";
91419150
?>

main/mySpace/duplicated_users.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@
151151
echo ' <label class="col-sm-3 control-label">'.get_lang('WhatToDoWithUnifiedUsers').'</label>';
152152
echo ' <div class="col-sm-6">';
153153
echo ' <div class="radio"><label>';
154-
echo ' <input type="radio" name="unify_mode" value="deactivate" '.($actionMode==='deactivate'?'checked':'').'> '.get_lang('DeactivateUsers');
154+
echo ' <input type="radio" name="unify_mode" value="deactivate" '.($actionMode==='deactivate'?'checked':'').'> '.get_lang('Deactivate');
155155
echo ' </label></div>';
156156
echo ' <div class="radio"><label>';
157-
echo ' <input type="radio" name="unify_mode" value="delete" '.($actionMode==='delete'?'checked':'').'> '.get_lang('DeleteUsers');
157+
echo ' <input type="radio" name="unify_mode" value="delete" '.($actionMode==='delete'?'checked':'').'> '.get_lang('Delete');
158158
echo ' </label></div>';
159159
echo ' </div>';
160160
echo ' </div>';
@@ -184,7 +184,7 @@
184184
$dups = MySpace::duGetDuplicateValues($fieldId, $urlId);
185185

186186
echo "<div class='panel panel-default'>";
187-
echo " <div class='panel-heading'><strong>".get_lang('ResultsFor').": </strong><code>".htmlspecialchars($selectedVar)."</code></div>";
187+
echo " <div class='panel-heading'><strong>".get_lang('SearchResultsFor').": </strong><code>".htmlspecialchars($selectedVar)."</code></div>";
188188
echo " <div class='panel-body'>";
189189

190190
if (empty($dups)) {

0 commit comments

Comments
 (0)