jprdonnelly/tcommon-studio-se
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maintenance/8.0' into feat/TBD-14909

Browse Source
This commit is contained in:
Svitlana Ponomarova
2024-01-29 12:53:30 +02:00
parent 6748c0c1cc 7fe2e8be48
commit b62a697ec8
18 changed files with 217 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
main/features/org.talend.m2e.feature/feature_fr.properties Normal file
View File

File diff suppressed because one or more lines are too long

41
main/features/org.talend.m2e.feature/feature_zh_CN.properties Normal file
View File

File diff suppressed because one or more lines are too long

1
main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties
View File

@@ -155,7 +155,6 @@ ProjectRepositoryNode.invalidItem=\u00C9l\u00E9ment invalide
ProjectRepositoryNode.columns=Colonnes
ProjectRepositoryNode.validationRules=R\u00E8gles de validation
ProjectRepositoryNode.cdcFoundation=Fondation CDC
ProjectRepositoryNode.cdcFoundation.deprecated=Fondation CDC (d\u00E9pr\u00E9ci\u00E9)
ProjectRepositoryNode.genericSchema=Sch\u00E9mas g\u00E9n\u00E9riques
ProjectRepositoryNode.queries=Requ\u00EAtes
ProjectRepositoryNode.synonymSchemas=Sch\u00E9mas synonymes

1
main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties
View File

@@ -155,7 +155,6 @@ ProjectRepositoryNode.invalidItem=\u65E0\u6548\u9879\u76EE
ProjectRepositoryNode.columns=\u5217
ProjectRepositoryNode.validationRules=\u9A8C\u8BC1\u89C4\u5219
ProjectRepositoryNode.cdcFoundation=CDC Foundation
ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u5DF2\u5F03\u7528)
ProjectRepositoryNode.genericSchema=\u901A\u7528 schema
ProjectRepositoryNode.queries=\u67E5\u8BE2
ProjectRepositoryNode.synonymSchemas=\u540C\u4E49\u5B57 schema

9
main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java
View File

@@ -20,7 +20,6 @@ import org.apache.commons.lang.StringUtils;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.pendo.PendoDataTrackFactory;
import org.talend.core.runtime.i18n.Messages;
import org.talend.core.service.ICloudSignOnService;
import org.talend.repository.model.RepositoryConstants;
@@ -254,7 +253,13 @@ public class ConnectionBean implements Cloneable {
String user = conDetails.getString(USER);
if (isToken()) {
String url = getDynamicFields().get(RepositoryConstants.REPOSITORY_URL);
user = PendoDataTrackFactory.getInstance().getTmcUser(url, getPassword());
if (ICloudSignOnService.get() != null) {
try {
user = ICloudSignOnService.get().getTokenUser(url, getPassword());
} catch (Exception e) {
ExceptionHandler.process(e);
}
}
if (StringUtils.isNotBlank(user)) {
setUser(user);
}

7
main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoDataTrackFactory.java
View File

@@ -63,11 +63,4 @@ public class PendoDataTrackFactory {
}
}
public String getTmcUser(String url, String token) {
if (coreRuntimeService != null) {
return coreRuntimeService.getTmcUser(url, token);
}
return "";
}
}

2
main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/ICloudSignOnService.java
View File

@@ -28,7 +28,7 @@ public interface ICloudSignOnService extends IService {
boolean hasValidToken() throws Exception;
String getTokenUser(String url, TokenMode token) throws Exception;
String getTokenUser(String url, String token) throws Exception;
void signonCloud(LoginEventListener listener) throws Exception;

2
main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/ICoreTisRuntimeService.java
View File

@@ -23,8 +23,6 @@ import org.talend.core.pendo.properties.IPendoDataProperties;
*/
public interface ICoreTisRuntimeService extends IService {
String getTmcUser(String url, String token);
AbstractPendoTrackManager getPendoProjectLoginManager();
AbstractPendoTrackManager getPendoGenericManager(TrackEvent event, IPendoDataProperties peoperties);

2
main/plugins/org.talend.cwm.mip.editor/plugin_fr.properties
View File

@@ -333,7 +333,7 @@ _UI_InformationsetModelWizard_description = Cr\u00E9er un mod\u00E8le Informatio
_UI_InformationsetEditor_label = \u00C9diteur de mod\u00E8le Informationset
_UI_InformationsetEditorFilenameDefaultBase = INVISIBLE dans l'interface
_UI_InformationsetEditorFilenameDefaultBase = Mon
_UI_InformationsetEditorFilenameExtension = informationset
_UI_InformationreportingModelWizard_label = Mod\u00E8le Informationreporting

1
main/plugins/org.talend.designer.maven.ui/plugin_fr.properties
View File

@@ -8,3 +8,4 @@ ProjectSettingPage_ProjectPom=Projet
ProjectSettingPage_ProjectPomDesc=Param\u00E8tres des POM du projet
ProjectSettingPage_MavenCustomSetup=Configurer les scripts personnalis\u00E9s par dossier
ProjectSettingPage_MavenCustomSetupDesc=Configurer les scripts Maven personnalis\u00E9s par dossier
TalendMavenPreferencePage=Maven

1
main/plugins/org.talend.designer.maven.ui/plugin_zh_CN.properties
View File

@@ -8,3 +8,4 @@ ProjectSettingPage_ProjectPom=\u5DE5\u7A0B
ProjectSettingPage_ProjectPomDesc=\u5DE5\u7A0B POM \u8BBE\u7F6E
ProjectSettingPage_MavenCustomSetup=\u6309\u6587\u4EF6\u5939\u8BBE\u7F6E\u81EA\u5B9A\u4E49\u811A\u672C
ProjectSettingPage_MavenCustomSetupDesc=\u6309\u6587\u4EF6\u5939\u8BBE\u7F6E\u81EA\u5B9A\u4E49 Maven \u811A\u672C
TalendMavenPreferencePage=Maven

2
main/plugins/org.talend.designer.maven.ui/src/main/java/messages_fr.properties
View File

@@ -23,3 +23,5 @@ MavenProjectSettingPage.syncAllPomsWarning=Cliquez sur Forcer la nouvelle synchr
MavenProjectSettingPage.skipFolders=Ignorer les dossiers
BuildProjectSettingPage.allowRecursiveJobsJoblets=Autorise les Jobs et Joblets r\u00E9cursifs (non support\u00E9 - pour des raisons de compatibilit\u00E9)
BuildProjectSettingPage.allowRecursiveJobs=Autoriser les Jobs r\u00E9cursifs (non recommand\u00E9)
TalendMavenPreferencePage.maven.offline=Hors ligne
TalendMavenPreferencePage.maven.warn=Le mode en ligne n'est pas recommand\u00E9 dans le Studio.

2
main/plugins/org.talend.designer.maven.ui/src/main/java/messages_zh_CN.properties
View File

@@ -23,3 +23,5 @@ MavenProjectSettingPage.syncAllPomsWarning=\u5355\u51FB \u201C\u5F3A\u5236\u5B8C
MavenProjectSettingPage.skipFolders=\u8DF3\u8FC7\u6587\u4EF6\u5939
BuildProjectSettingPage.allowRecursiveJobsJoblets=\u5141\u8BB8\u9012\u5F52\u4F5C\u4E1A\u548C\u5C0F\u4F5C\u4E1A (\u4E0D\u652F\u6301 - \u4EC5\u7528\u4E8E\u517C\u5BB9\u6027)
BuildProjectSettingPage.allowRecursiveJobs=\u5141\u8BB8\u9012\u5F52\u4F5C\u4E1A (\u4E0D\u63A8\u8350)
TalendMavenPreferencePage.maven.offline=\u79BB\u7EBF
TalendMavenPreferencePage.maven.warn=Studio \u5185\u4E0D\u5EFA\u8BAE\u4F7F\u7528\u5728\u7EBF\u6A21\u5F0F\u3002

58
main/plugins/org.talend.designer.maven/src/main/java/org/eclipse/m2e/internal/launch/messages_fr.properties Normal file
View File

@@ -0,0 +1,58 @@
#Eclipse modern messages class
#Sat Apr 19 16:43:19 MSK 2014
ExecutePomAction_dialog_debug_message=S\u00E9lectionnez une configuration de d\u00E9marrage pour le d\u00E9bogage\u00A0:
ExecutePomAction_dialog_run_message=S\u00E9lectionnez une configuration de d\u00E9marrage pour l'ex\u00E9cution\u00A0:
ExecutePomAction_dialog_title=S\u00E9lectionner une configuration
ExecutePomAction_executing=Ex\u00E9cution de {0} dans {1}
MavenLaunchDelegate_error_cannot_create_conf=Impossible de cr\u00E9er m2.conf
MavenLaunchDelegate_job_name=Actualisation des ressources...
MavenLaunchDelegate_error_cannot_read_jvmConfig=Impossible de lire la configuration de la JVM depuis {0}
MavenLaunchExtensionsTab_lblExtensions=D\u00E9marrer les extensions Maven
MavenLaunchExtensionsTab_name=D\u00E9marrer les extensions
MavenLaunchMainTab_btnAfterClean=S\u00E9lec&tionner...
MavenLaunchMainTab_btnAutoBuild=&S\u00E9lectionner...
MavenLaunchMainTab_btnCleanBuild=S\u00E9&lectionner...
MavenLaunchMainTab_btnConfigure=Configurer...
MavenLaunchMainTab_btnDebugOutput=D\u00E9bo&guer la sortie
MavenLaunchMainTab_btnManualBuild=S&\u00E9lectionner...
MavenLaunchMainTab_btnNotRecursive=Non r\u00E9cursif
MavenLaunchMainTab_btnOffline=Hors ligne (&O)
MavenLaunchMainTab_btnResolveWorkspace=R\u00E9soudre les artefacts de l'espace de travail
MavenLaunchMainTab_btnSkipTests=Ignorer les tests (&k)
MavenLaunchMainTab_btnUpdateSnapshots=Mettre \u00E0 jour les Snapshots (&U)
MavenLaunchMainTab_lblAfterClean=Goals apr\u00E8s Clean (&f)\u00A0:
MavenLaunchMainTab_lblAutoBuildGoals=Goals &Build Auto\u00A0:
MavenLaunchMainTab_lblCleanBuild=Goals au cours d'un Clean (&D)\u00A0:
MavenLaunchMainTab_lblManualGoals=Goals du Build ma&nuel\u00A0:
MavenLaunchMainTab_lblRuntime=Runt&ime Maven\u00A0:
MavenLaunchMainTab_lblThreads=&Threads\u00A0:
MavenLaunchMainTab_lblEnableColorOutput=&Colorer la sortie\u00A0:
MavenLaunchMainTab_lblEnableColorOutput_Auto=Auto
MavenLaunchMainTab_lblEnableColorOutput_Always=Toujours
MavenLaunchMainTab_lblEnableColorOutput_Never=Jamais
MavenLaunchMainTab_lblUserSettings_text=Param\u00E8tres utilisateur\u00A0:
MavenLaunchMainTab_property_dialog_edit_title=Modifier le param\u00E8tre
MavenLaunchMainTab_property_dialog_title=Ajouter un param\u00E8tre
MavenJRETab_lblDefault=JRE d'ex\u00E9cution Maven par d\u00E9faut\u00A0: {0}
MavenJRETab_lblDefaultDetailsRequiredJavaVersion={0} (s\u00E9lection auto dans l'intervalle de versions Java requis {1})
MavenLaunchUtils_error_no_maven_install=L'installation de Maven est introuvable {0}
MavenLaynchDelegate_unsupported_source_locator=Locator de source inconnu on non support\u00E9 {0}
launchBrowseFs=Syst\u00E8&me de fichiers...
launchBrowseVariables=&Variables...
launchBrowseWorkspace=Espace de travail... (&W)
launchChoosePomDir=S\u00E9lectionner le r\u00E9pertoire de &Base
launchChooseSettingsFile=S\u00E9lectionner le fichier des param\u00E8tre&S
launchGoals=&S\u00E9lectionner...
launchGoalsLabel=&Goals\u00A0:
launchMainTabName=Main
launchPomDirectoryDoesntExist=Le r\u00E9pertoire de base n'existe pas ou ne peut \u00EAtre lu
launchErrorEvaluatingBaseDirectory=Le nom du r\u00E9pertoire de base ne peut \u00EAtre \u00E9valu\u00E9
launchPomDirectoryEmpty=Le r\u00E9pertoire de base doit \u00EAtre sp\u00E9cifi\u00E9
launchPomGroup=R\u00E9pertoire de base\u00A0:
launchProfilesLabel=&Profils\u00A0:
launchPropAddButton=&Ajouter...
launchPropEditButton=Mo&difier...
launchPropName=Nom du param\u00E8tre
launchPropRemoveButton=Supp&rimer
launchPropValue=Valeur
launchPropertyDialogBrowseVariables=Varia&bles...

58
main/plugins/org.talend.designer.maven/src/main/java/org/eclipse/m2e/internal/launch/messages_zh_CN.properties Normal file
View File

@@ -0,0 +1,58 @@
#Eclipse modern messages class
#Sat Apr 19 16:43:19 MSK 2014
ExecutePomAction_dialog_debug_message=\u9009\u62E9\u8981\u8C03\u8BD5\u7684\u542F\u52A8\u914D\u7F6E\uFF1A
ExecutePomAction_dialog_run_message=\u9009\u62E9\u8981\u8FD0\u884C\u7684\u542F\u52A8\u914D\u7F6E\uFF1A
ExecutePomAction_dialog_title=\u9009\u62E9\u914D\u7F6E
ExecutePomAction_executing=\u5728 {1} \u4E2D\u6267\u884C {0}
MavenLaunchDelegate_error_cannot_create_conf=\u65E0\u6CD5\u521B\u5EFA m2.conf
MavenLaunchDelegate_job_name=\u6B63\u5728\u5237\u65B0\u8D44\u6E90...
MavenLaunchDelegate_error_cannot_read_jvmConfig=\u65E0\u6CD5\u4ECE {0} \u8BFB\u53D6 JVM \u914D\u7F6E
MavenLaunchExtensionsTab_lblExtensions=Maven \u542F\u52A8\u6269\u5C55
MavenLaunchExtensionsTab_name=\u542F\u52A8\u6269\u5C55
MavenLaunchMainTab_btnAfterClean=\u9009\u62E9(&T)...
MavenLaunchMainTab_btnAutoBuild=\u9009\u62E9(&S)...
MavenLaunchMainTab_btnCleanBuild=\u9009\u62E9(&L)...
MavenLaunchMainTab_btnConfigure=\u914D\u7F6E...
MavenLaunchMainTab_btnDebugOutput=\u8C03\u8BD5\u8F93\u51FA(&G)
MavenLaunchMainTab_btnManualBuild=\u9009\u62E9(&E)...
MavenLaunchMainTab_btnNotRecursive=\u975E\u9012\u5F52
MavenLaunchMainTab_btnOffline=\u79BB\u7EBF(&O)
MavenLaunchMainTab_btnResolveWorkspace=\u89E3\u51B3\u5DE5\u4F5C\u533A\u4F5C\u54C1
MavenLaunchMainTab_btnSkipTests=\u8DF3\u8FC7\u6D4B\u8BD5(&K)
MavenLaunchMainTab_btnUpdateSnapshots=\u66F4\u65B0\u5FEB\u7167(&U)
MavenLaunchMainTab_lblAfterClean=\u5728\u6E05\u7406\u76EE\u6807\u4E4B\u540E(&F)\uFF1A
MavenLaunchMainTab_lblAutoBuildGoals=\u81EA\u52A8\u6784\u5EFA\u76EE\u6807(&B)\uFF1A
MavenLaunchMainTab_lblCleanBuild=\u5728\u6E05\u7406\u76EE\u6807\u671F\u95F4(&D)\uFF1A
MavenLaunchMainTab_lblManualGoals=\u624B\u52A8\u6784\u5EFA\u76EE\u6807(&N)\uFF1A
MavenLaunchMainTab_lblRuntime=Maven \u8FD0\u884C\u65F6(&I)\uFF1A
MavenLaunchMainTab_lblThreads=\u7EBF\u7A0B(&T)\uFF1A
MavenLaunchMainTab_lblEnableColorOutput=\u989C\u8272\u8F93\u51FA(&C)\uFF1A
MavenLaunchMainTab_lblEnableColorOutput_Auto=\u81EA\u52A8
MavenLaunchMainTab_lblEnableColorOutput_Always=\u603B\u662F
MavenLaunchMainTab_lblEnableColorOutput_Never=\u4ECE\u4E0D
MavenLaunchMainTab_lblUserSettings_text=\u7528\u6237\u8BBE\u7F6E\uFF1A
MavenLaunchMainTab_property_dialog_edit_title=\u7F16\u8F91\u53C2\u6570
MavenLaunchMainTab_property_dialog_title=\u6DFB\u52A0\u53C2\u6570
MavenJRETab_lblDefault=\u9ED8\u8BA4 Maven Execution JRE\uFF1A {0}
MavenJRETab_lblDefaultDetailsRequiredJavaVersion={0} \uFF08\u4ECE\u6240\u9700\u7684 Java \u7248\u672C\u8303\u56F4 {1} \u4E2D\u81EA\u52A8\u9009\u62E9\uFF09
MavenLaunchUtils_error_no_maven_install=\u65E0\u6CD5\u627E\u5230 Maven \u5B89\u88C5 {0}
MavenLaynchDelegate_unsupported_source_locator=\u672A\u77E5\u6216\u4E0D\u652F\u6301\u7684\u6E90\u5B9A\u4F4D\u5668 {0}
launchBrowseFs=\u6587\u4EF6\u7CFB\u7EDF(&M)...
launchBrowseVariables=\u53D8\u91CF(&V)...
launchBrowseWorkspace=\u5DE5\u4F5C\u533A(&W)...
launchChoosePomDir=\u9009\u62E9\u57FA\u672C\u76EE\u5F55(&B)
launchChooseSettingsFile=\u9009\u62E9\u8BBE\u7F6E\u6587\u4EF6(&S)
launchGoals=\u9009\u62E9(&S)...
launchGoalsLabel=\u76EE\u6807(&G)\uFF1A
launchMainTabName=\u4E3B
launchPomDirectoryDoesntExist=\u57FA\u672C\u76EE\u5F55\u4E0D\u5B58\u5728\u6216\u65E0\u6CD5\u8BFB\u53D6
launchErrorEvaluatingBaseDirectory=\u65E0\u6CD5\u8BA1\u7B97\u57FA\u672C\u76EE\u5F55\u540D
launchPomDirectoryEmpty=\u5E94\u6307\u5B9A\u57FA\u672C\u76EE\u5F55
launchPomGroup=\u57FA\u672C\u76EE\u5F55\uFF1A
launchProfilesLabel=\u914D\u7F6E\u6587\u4EF6(&P)\uFF1A
launchPropAddButton=\u6DFB\u52A0(&A)...
launchPropEditButton=\u7F16\u8F91(&D)...
launchPropName=\u53C2\u6570\u540D\u79F0
launchPropRemoveButton=\u79FB\u9664(&R)
launchPropValue=\u503C
launchPropertyDialogBrowseVariables=\u53D8\u91CF(&B)...

1
main/plugins/org.talend.rcp/src/main/java/messages_fr.properties
View File

@@ -115,3 +115,4 @@ WorkbenchMessages.ShowView_errorTitle=Probl\u00E8me lors de l'affichage de la vu
ComponentsManager.form.install.dialog.restart.title=Red\u00E9marrer le Studio
ComponentsManager.form.install.dialog.restart.message=Vous devez red\u00E9marrer le Studio pour terminer l'installation.\n\nSouhaitez-vous le red\u00E9marrer maintenant ?
JavaVersion.CheckError=Une mise \u00E0 niveau de Java est requise. La version minimale de Java est {0}, la version actuelle est {1}.
JavaVersion.CheckError.notSupported=La version Java maximale support\u00E9e par le Studio est {0}. Votre version actuelle est {1}.

1
main/plugins/org.talend.rcp/src/main/java/messages_zh_CN.properties
View File

@@ -115,3 +115,4 @@ WorkbenchMessages.ShowView_errorTitle=\u95EE\u9898\u5217\u8868\u89C6\u56FE
ComponentsManager.form.install.dialog.restart.title=\u91CD\u65B0\u542F\u52A8 Studio
ComponentsManager.form.install.dialog.restart.message=\u6211\u4EEC\u9700\u8981\u91CD\u65B0\u542F\u52A8 Studio \u4EE5\u5B8C\u6210\u5B89\u88C5\u3002\n\n\u662F\u5426\u8981\u7ACB\u5373\u91CD\u65B0\u542F\u52A8 Studio\uFF1F
JavaVersion.CheckError=\u9700\u8981\u5347\u7EA7 Java\uFF0C\u8981\u6C42\u7684\u6700\u4F4E Java \u7248\u672C\u4E3A {0}\uFF0C\u5F53\u524D\u7248\u672C\u4E3A {1}\u3002
JavaVersion.CheckError.notSupported=Studio\u652F\u6301\u7684\u6700\u9AD8Java\u7248\u672C\u4E3A{0}\u3002\u60A8\u5F53\u4E0B\u7684\u7248\u672C\u662F{1}\u3002

3
main/plugins/org.talend.rcp/touchpoint/p2.inf
View File

@@ -25,7 +25,8 @@ addJvmArgs(jvmArgs:\
--add-opens=java.base/sun.security.pkcs=ALL-UNNAMED|\
--add-opens=java.base/sun.security.x509=ALL-UNNAMED|\
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED|\
--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED);
--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED|\
--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED);
instructions.configure.import=\
org.talend.studiolite.p2.touchpoint.removeJvmArgs,\
org.talend.studiolite.p2.touchpoint.addJvmArgs