Skip to content

Commit 060be93

Browse files
committed
add bundle key for translation context and prefill key name #213
1 parent 7db66c9 commit 060be93

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

src/fr/adrienbrault/idea/symfony2plugin/Symfony2Icons.java

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class Symfony2Icons {
2626
public static final Icon FORM_EXTENSION = IconLoader.getIcon("icons/form_extension.png");
2727
public static final Icon SERVICE_TAG = IconLoader.getIcon("icons/service_tag.png");
2828
public static final Icon EVENT = IconLoader.getIcon("icons/event.png");
29+
public static final Icon BUNDLE = IconLoader.getIcon("icons/bundle.png");
2930

3031
public static final Icon SERVICE_PRIVATE_OPACITY = IconLoader.getIcon("icons/service_private_opacity.png");
3132

src/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,13 @@ public void actionPerformed(AnActionEvent event) {
132132
reselectedDomain = sortedMap.firstKey();
133133
}
134134

135+
String defaultKey = null;
136+
if(translationText.length() < 15) {
137+
defaultKey = translationText.toLowerCase().replace(" ", ".");
138+
}
139+
135140
final String finalDefaultDomain = defaultDomain;
136-
TranslatorKeyExtractorDialog extractorDialog = new TranslatorKeyExtractorDialog(psiElement.getProject(), (PsiFile) psiFile, domainNames, reselectedDomain, new TranslatorKeyExtractorDialog.OnOkCallback() {
141+
TranslatorKeyExtractorDialog extractorDialog = new TranslatorKeyExtractorDialog(psiElement.getProject(), (PsiFile) psiFile, domainNames, defaultKey, reselectedDomain, new TranslatorKeyExtractorDialog.OnOkCallback() {
137142
@Override
138143
public void onClick(List<TranslationFileModel> files, final String keyName, final String domain, boolean navigateTo) {
139144

Loading
Loading

src/fr/adrienbrault/idea/symfony2plugin/translation/form/TranslatorKeyExtractorDialog.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
1515
import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
1616
import org.apache.commons.lang.StringUtils;
17+
import org.jetbrains.annotations.NotNull;
1718
import org.jetbrains.annotations.Nullable;
1819

1920
import javax.swing.*;
@@ -40,7 +41,7 @@ public class TranslatorKeyExtractorDialog extends JDialog {
4041
private final Project project;
4142
private final PsiFile fileContext;
4243

43-
public TranslatorKeyExtractorDialog(Project project, PsiFile fileContext, Collection<String> domains, String defaultDomain, OnOkCallback okCallback) {
44+
public TranslatorKeyExtractorDialog(@NotNull Project project, @NotNull PsiFile fileContext, @NotNull Collection<String> domains, @Nullable String defaultKey, @NotNull String defaultDomain, @NotNull OnOkCallback okCallback) {
4445

4546
this.project = project;
4647
this.fileContext = fileContext;
@@ -50,6 +51,10 @@ public TranslatorKeyExtractorDialog(Project project, PsiFile fileContext, Collec
5051
comboBox1.addItem(domain);
5152
}
5253

54+
if(defaultKey != null) {
55+
textTranslationKey.setText(defaultKey);
56+
}
57+
5358
setContentPane(contentPane);
5459
setModal(true);
5560
getRootPane().setDefaultButton(buttonOK);
@@ -241,7 +246,7 @@ public IconColumn() {
241246
public Icon valueOf(TranslationFileModel modelParameter) {
242247

243248
if(modelParameter.isBoldness()) {
244-
return Symfony2Icons.SYMFONY;
249+
return Symfony2Icons.BUNDLE;
245250
}
246251

247252
return modelParameter.getPsiFile().getIcon(0);

0 commit comments

Comments
 (0)