From 1168d0db45dc6105a4e88a7749ad5867d37049d2 Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Sat, 6 Aug 2016 07:27:20 -0700 Subject: [PATCH] Should be R.string, not R.strings Summary: Fix regression of https://github.com/rnpm/rnpm-plugin-link/pull/88. Closes https://github.com/facebook/react-native/pull/9252 Differential Revision: D3680785 fbshipit-source-id: a6ea63295ae8f61b17c0a1b2ca5e6a5f5da7437a --- local-cli/rnpm/link/__tests__/android/applyPatch.spec.js | 2 +- local-cli/rnpm/link/src/android/patches/applyParams.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/local-cli/rnpm/link/__tests__/android/applyPatch.spec.js b/local-cli/rnpm/link/__tests__/android/applyPatch.spec.js index 35ff81057..43af95b7c 100644 --- a/local-cli/rnpm/link/__tests__/android/applyPatch.spec.js +++ b/local-cli/rnpm/link/__tests__/android/applyPatch.spec.js @@ -8,7 +8,7 @@ describe('applyParams', () => { it('apply params to the string', () => { expect( applyParams('${foo}', {foo: 'foo'}, 'react-native') - ).toEqual('this.getResources().getString(R.strings.reactNative_foo)'); + ).toEqual('this.getResources().getString(R.string.reactNative_foo)'); }); it('use null if no params provided', () => { diff --git a/local-cli/rnpm/link/src/android/patches/applyParams.js b/local-cli/rnpm/link/src/android/patches/applyParams.js index d91bbb0d5..44f4d1624 100644 --- a/local-cli/rnpm/link/src/android/patches/applyParams.js +++ b/local-cli/rnpm/link/src/android/patches/applyParams.js @@ -7,7 +7,7 @@ module.exports = function applyParams(str, params, prefix) { const name = toCamelCase(prefix) + '_' + param; return params[param] - ? `this.getResources().getString(R.strings.${name})` + ? `this.getResources().getString(R.string.${name})` : null; } );