Merge pull request #5 from mo-ah-dawood/master

Add arguments to translate method
msayed-net · May 12, 2020 · 1cdd24f · 1cdd24f
2 parents 2f9f30a + 54c82f4
commit 1cdd24f
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 215 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@
 .pub/
 
 build/
+pubspec.lock
+example/pubspec.lock
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ Flutter Localization In Human Way
 | ------------- |:-------------:|
 | `init()` |initialize things, before runApp() |
 | `translate('word')` |word translation |
+| `translate('word',{"key":"value"})` |word translation with replacement arguments|
 | `googleTranslate('word', from: 'en', to: 'ar')` |google translate |
 | `setNewLanguage(context,newLanguage:'en',restart: true, remember: true,)` |change language |
 | `isDirectionRTL()` |is Direction RTL check |

diff --git a/android/.gitignore b/android/.gitignore
diff --git a/android/build.gradle b/android/build.gradle
diff --git a/android/gradle.properties b/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/settings.gradle b/android/settings.gradle
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
diff --git a/android/src/main/kotlin/net/msayed/localize_and_translate/LocalizeAndTranslatePlugin.kt b/android/src/main/kotlin/net/msayed/localize_and_translate/LocalizeAndTranslatePlugin.kt
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -21,7 +21,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -64,7 +64,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.0"
+    version: "0.16.1"
   localize_and_translate:
     dependency: "direct main"
     description:

diff --git a/ios/.gitignore b/ios/.gitignore
diff --git a/ios/Assets/.gitkeep b/ios/Assets/.gitkeep
diff --git a/ios/Classes/LocalizeAndTranslatePlugin.h b/ios/Classes/LocalizeAndTranslatePlugin.h
diff --git a/ios/Classes/LocalizeAndTranslatePlugin.m b/ios/Classes/LocalizeAndTranslatePlugin.m
diff --git a/ios/Classes/SwiftLocalizeAndTranslatePlugin.swift b/ios/Classes/SwiftLocalizeAndTranslatePlugin.swift
diff --git a/ios/localize_and_translate.podspec b/ios/localize_and_translate.podspec
diff --git a/lib/localize_and_translate.dart b/lib/localize_and_translate.dart
@@ -35,10 +35,14 @@ class LocalizeAndTranslate {
   ///------------------------------------------------
   /// Transle : [key]
   ///------------------------------------------------
-  String translate(String key) {
-    return (_values == null || _values[key] == null)
-        ? '$key'
-        : _values[key];
+  String translate(String key, [Map<String, String> arguments]) {
+    String value =
+        (_values == null || _values[key] == null) ? '$key' : _values[key];
+    if (arguments == null) return value;
+    for (var key in arguments.keys) {
+      value = value.replaceAll(key, arguments[key]);
+    }
+    return value;
   }
 
   ///------------------------------------------------

diff --git a/pubspec.lock b/pubspec.lock
@@ -21,7 +21,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -57,7 +57,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.0"
+    version: "0.16.1"
   meta:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,4 @@ dependencies:
   intl: ^0.16.0
   translator: ^0.1.4
 
-flutter:
-  plugin:
-    androidPackage: net.msayed.localize_and_translate
-    pluginClass: LocalizeAndTranslatePlugin
+