Skip to content

Commit

Permalink
Merge pull request #181 from marhali/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
marhali authored Sep 3, 2022
2 parents 761677b + 6858590 commit 624a29b
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 37 deletions.
13 changes: 9 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
# easy-i18n Changelog

## [Unreleased]
### Changed
- Removed warning about missing configuration during project initialization

### Fixed
- Folding support for Vue files

## [4.2.2]
### Changed
- Documentation provider better focuses on the actual translation part
- Color duplicate translation values orange to increase contrast in light themes
### Changed
- Documentation provider better focuses on the actual translation part
- Color duplicate translation values orange to increase contrast in light themes

### Fixed
### Fixed
- Unintended overwrite of existing folding regions

## [4.2.1]
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
pluginGroup = de.marhali.easyi18n
pluginName = easy-i18n
# SemVer format -> https://semver.org
pluginVersion = 4.2.2
pluginVersion = 4.2.3

# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
Expand All @@ -17,7 +17,7 @@ platformVersion = 2022.2

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
platformPlugins = org.jetbrains.kotlin, JavaScriptLanguage, org.jetbrains.plugins.vue:222.3345.111, com.jetbrains.php:222.3345.118
platformPlugins = org.jetbrains.kotlin, JavaScriptLanguage, com.jetbrains.php:222.3345.118

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 7.5.1
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/de/marhali/easyi18n/DataStore.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ public void loadFromPersistenceLayer(@NotNull Consumer<Boolean> successResult) {
this.data = new TranslationData(settings.isSorting());
successResult.accept(false);

if(ex instanceof EmptyLocalesDirException) {
NotificationHelper.createEmptyLocalesDirNotification(project);
} else {
if(!(ex instanceof EmptyLocalesDirException)) {
NotificationHelper.createIOError(settings, ex);
}
}
Expand Down
13 changes: 13 additions & 0 deletions src/main/resources/META-INF/de.marhali.easyi18n-html.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<lang.foldingBuilder
language="HTML"
implementationClass="de.marhali.easyi18n.assistance.folding.JsFoldingBuilder"
/>

<lang.documentationProvider
language="HTML"
implementationClass="de.marhali.easyi18n.assistance.documentation.CommonDocumentationProvider"
/>
</extensions>
</idea-plugin>
27 changes: 0 additions & 27 deletions src/main/resources/META-INF/de.marhali.easyi18n-vue.xml

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

<depends optional="true" config-file="de.marhali.easyi18n-kotlin.xml">org.jetbrains.kotlin</depends>
<depends optional="true" config-file="de.marhali.easyi18n-javascript.xml">JavaScript</depends>
<depends optional="true" config-file="de.marhali.easyi18n-html.xml">com.intellij.modules.xml</depends>
<depends optional="true" config-file="de.marhali.easyi18n-java.xml">com.intellij.java</depends>
<depends optional="true" config-file="de.marhali.easyi18n-vue.xml">org.jetbrains.plugins.vue</depends>
<depends optional="true" config-file="de.marhali.easyi18n-php.xml">com.jetbrains.php</depends>

<actions>
Expand Down

0 comments on commit 624a29b

Please sign in to comment.